diff options
| author | Jay Berkenbilt <jberkenbilt@users.noreply.github.com> | 2023-09-03 14:54:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-03 14:54:12 +0200 |
| commit | 2b4dcb33aa3cc130241894df78e2b67bbe5c99b8 (patch) | |
| tree | 12e3ed0c43b214a852b683cf0c40e81c824d3f44 | |
| parent | fec75b44b4d5b0ee84c5bf98fee6139dceacfde3 (diff) | |
| parent | b0c3ea2bb6e0cab1d09726f3e66742eaf45c5745 (diff) | |
| download | qpdf-2b4dcb33aa3cc130241894df78e2b67bbe5c99b8.tar.zst | |
Merge pull request #1014 from m-holger/i1011
Change QPDF::copyForeignObject to return a null object when called wi…
| -rw-r--r-- | libqpdf/QPDF.cc | 12 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf/copy-foreign-objects-25.out | 1 | ||||
| -rw-r--r-- | qpdf/test_driver.cc | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index e39f9b7a..95ed39ec 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -2034,13 +2034,13 @@ QPDF::copyForeignObject(QPDFObjectHandle foreign) } obj_copier.to_copy.clear(); - auto& result = obj_copier.object_map[foreign.getObjGen()]; - if (!result.isInitialized()) { - result = QPDFObjectHandle::newNull(); - warn(damagedPDF("Unexpected reference to /Pages object while copying foreign object. " - "Replacing with Null object.")); + auto og = foreign.getObjGen(); + if (!obj_copier.object_map.count(og)) { + warn(damagedPDF("unexpected reference to /Pages object while copying foreign object; " + "replacing with null")); + return QPDFObjectHandle::newNull(); } - return result; + return obj_copier.object_map[foreign.getObjGen()]; } void diff --git a/qpdf/qtest/qpdf/copy-foreign-objects-25.out b/qpdf/qtest/qpdf/copy-foreign-objects-25.out index da8906a7..36b5bb0d 100644 --- a/qpdf/qtest/qpdf/copy-foreign-objects-25.out +++ b/qpdf/qtest/qpdf/copy-foreign-objects-25.out @@ -1 +1,2 @@ +WARNING: minimal.pdf (object 6 0, offset 556): unexpected reference to /Pages object while copying foreign object; replacing with null test 25 done diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc index b2ed825d..2e661fdb 100644 --- a/qpdf/test_driver.cc +++ b/qpdf/test_driver.cc @@ -954,6 +954,8 @@ test_25(QPDF& pdf, char const* arg2) // Copy qtest without crossing page boundaries. Should get O1 // and O2 and their streams but not O3 or any other pages. + // Also verify that attempts to copy /Pages objects return null. + assert(arg2 != nullptr); { // Make sure original PDF is out of scope when we write. @@ -961,6 +963,8 @@ test_25(QPDF& pdf, char const* arg2) oldpdf.processFile(arg2); QPDFObjectHandle qtest = oldpdf.getTrailer().getKey("/QTest"); pdf.getTrailer().replaceKey("/QTest", pdf.copyForeignObject(qtest)); + + assert(pdf.copyForeignObject(oldpdf.getRoot().getKey("/Pages")).isNull()); } QPDFWriter w(pdf, "a.pdf"); |