Merge pull request #1542 from m-holger/fuzz

Add key and value validation in `NNTreeImpl` replacement logic to ens…

Merge pull request #1542 from m-holger/fuzz
Add key and value validation in `NNTreeImpl` replacement logic to ens…
m-holger · GitHub
2 parents 6ccbc121 14dba6a7
Showing 4 changed files with 3 additions and 2 deletions
fuzz/CMakeLists.txt
fuzz/qpdf_extra/6310410941956096.fuzz
fuzz/qtest/fuzz.test
libqpdf/NNTree.cc
@@ -164,6 +164,7 @@ set(CORPUS_OTHER
   4720043549327360.fuzz
   5109284021272576.fuzz
   5828408539152384.fuzz
+  6310410941956096.fuzz
   6489005569146880.fuzz
 )
  
@@ -11,7 +11,7 @@ my $td = new TestDriver(&#39;fuzz&#39;);
  
 my $qpdf_corpus = $ENV{'QPDF_FUZZ_CORPUS'} || die "must set QPDF_FUZZ_CORPUS";
  
-my $n_qpdf_files = 102;       # increment when adding new files
+my $n_qpdf_files = 103;       # increment when adding new files
  
 my @fuzzers = (
     ['ascii85' => 1],
@@ -666,7 +666,7 @@ NNTreeImpl::repair()
     NNTreeImpl repl(qpdf, new_node, key_type, value_valid, false);
     std::map<QPDFObjectHandle, QPDFObjectHandle, Cmp> items;
     for (auto const& [key, value]: *this) {
-        if (key && value) {
+        if (key && value && repl.keyValid(key) && repl.value_valid(value) ) {
             items.insert_or_assign(key, value);
         }
     }