Tweak QPDF::replaceObject

m-holger
1 parent 5641832e
Showing 2 changed files with 6 additions and 6 deletions
include/qpdf/QPDF.hh
libqpdf/QPDF.cc
@@ -1038,7 +1038,7 @@ class QPDF
     QPDFObjectHandle makeIndirectFromQPDFObject(std::shared_ptr<QPDFObject> const& obj);
     bool isCached(QPDFObjGen const& og);
     bool isUnresolved(QPDFObjGen const& og);
-    void removeObject(QPDFObjGen const& og);
+    void removeObject(QPDFObjGen og);
     void updateCache(
         QPDFObjGen const& og,
         std::shared_ptr<QPDFObject> const& object,
@@ -1987,15 +1987,15 @@ QPDF::replaceObject(QPDFObjGen const&amp; og, QPDFObjectHandle oh)
 }
  
 void
-QPDF::removeObject(QPDFObjGen const& og)
+QPDF::removeObject(QPDFObjGen og)
 {
-    auto null = QPDFObjectHandle::newNull();
     m->xref_table.erase(og);
-    if (isCached(og)) {
+    if (auto cached = m->obj_cache.find(og); cached != m->obj_cache.end()) {
         // Take care of any object handles that may be floating around.
-        replaceObject(og, null);
+        cached->second.object->assign(QPDF_Null::create());
+        cached->second.object->setObjGen(nullptr, QPDFObjGen());
+        m->obj_cache.erase(cached);
     }
-    m->obj_cache.erase(og);
 }
  
 void