OpenSystemsDevelopment / qpdf

Commit 61f7d97b20b072d6f11d71d36d196289b1a9023f

Authored by m-holger
Committed by GitHub
2 parents 54ac92eb 9ba6e070

Merge pull request #1283 from m-holger/fuzz 

Fix #1242
Inline Side-by-side
Showing 5 changed files with 10 additions and 3 deletions
fuzz/CMakeLists.txt
  View file @61f7d97
... ... @@ -140,6 +140,7 @@ set(CORPUS_OTHER
140 140 70306.fuzz
141 141 70306a.fuzz
142 142 70306b.fuzz
  143 + 71624.fuzz
143 144 )
144 145  
145 146 set(CORPUS_DIR ${CMAKE_CURRENT_BINARY_DIR}/qpdf_corpus)
... ...
fuzz/qpdf_extra/71624.fuzz 0 → 100644
View file @61f7d97
No preview for this file type
fuzz/qtest/fuzz.test
  View file @61f7d97
... ... @@ -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 = 77; # increment when adding new files
  14 +my $n_qpdf_files = 78; # increment when adding new files
15 15  
16 16 my @fuzzers = (
17 17 ['ascii85' => 1],
... ...
include/qpdf/QPDF.hh
  View file @61f7d97
... ... @@ -676,7 +676,7 @@ class QPDF
676 676 // Traverse page tree return all /Page objects. It also detects and resolves cases in which the
677 677 // same /Page object is duplicated. For efficiency, this method returns a const reference to an
678 678 // internal vector of pages. Calls to addPage, addPageAt, and removePage safely update this, but
679   - // directly manipulation of the pages tree or pushing inheritable objects to the page level may
  679 + // direct manipulation of the pages tree or pushing inheritable objects to the page level may
680 680 // invalidate it. See comments for updateAllPagesCache() for additional notes. Newer code should
681 681 // use QPDFPageDocumentHelper::getAllPages instead. The decision to expose this internal cache
682 682 // was arguably incorrect, but it is being left here for compatibility. It is, however,
... ...
libqpdf/QPDF_pages.cc
  View file @61f7d97
... ... @@ -71,7 +71,13 @@ QPDF::getAllPages()
71 71 throw QPDFExc(
72 72 qpdf_e_pages, m->file->getName(), "", 0, "root of pages tree has no /Kids array");
73 73 }
74   - getAllPagesInternal(pages, visited, seen, false);
  74 + try {
  75 + getAllPagesInternal(pages, visited, seen, false);
  76 + } catch (...) {
  77 + m->all_pages.clear();
  78 + m->invalid_page_found = false;
  79 + throw;
  80 + }
75 81 if (m->invalid_page_found) {
76 82 flattenPagesTree();
77 83 m->invalid_page_found = false;
... ...