Merge pull request #1014 from m-holger/i1011

Change QPDF::copyForeignObject to return a null object when called wi…

1 files changed, 6 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