OpenSystemsDevelopment / qpdf

Commit 70f7af78e19e98c7d1518ca6590deae79657ab57

Authored by m-holger
1 parent 7a2ef592

Fix QPDFOutlineObjectHelper loop detectection 

Check for direct outline items.

Fixes oss-fuzz case 	389339260.
Inline Side-by-side
Showing 4 changed files with 3 additions and 2 deletions
fuzz/CMakeLists.txt
  View file @70f7af7
... ... @@ -148,6 +148,7 @@ set(CORPUS_OTHER
148 148 369662293a.fuzz
149 149 376305073.fuzz
150 150 377977949.fuzz
  151 + 389339260.fuzz
151 152 389974979.fuzz
152 153 391974927.fuzz
153 154 )
... ...
fuzz/qpdf_extra/389339260.fuzz 0 → 100644
View file @70f7af7
No preview for this file type
fuzz/qtest/fuzz.test
  View file @70f7af7
... ... @@ -11,7 +11,7 @@ my $td = new TestDriver('fuzz');
11 11  
12 12 my $qpdf_corpus = $ENV{'QPDF_FUZZ_CORPUS'} || die "must set QPDF_FUZZ_CORPUS";
13 13  
14   -my $n_qpdf_files = 87; # increment when adding new files
  14 +my $n_qpdf_files = 88; # increment when adding new files
15 15  
16 16 my @fuzzers = (
17 17 ['ascii85' => 1],
... ...
libqpdf/QPDFOutlineObjectHelper.cc
  View file @70f7af7
... ... @@ -25,7 +25,7 @@ QPDFOutlineObjectHelper::QPDFOutlineObjectHelper(
25 25  
26 26 QPDFObjGen::set children;
27 27 QPDFObjectHandle cur = oh.getKey("/First");
28   - while (!cur.isNull() && children.add(cur)) {
  28 + while (!cur.isNull() && cur.isIndirect() && children.add(cur)) {
29 29 QPDFOutlineObjectHelper new_ooh(cur, dh, 1 + depth);
30 30 new_ooh.m->parent = std::make_shared<QPDFOutlineObjectHelper>(*this);
31 31 m->kids.push_back(new_ooh);
... ...