From 2a2eebcaea2b27bc86390dac2ee27ad5620f5eda Mon Sep 17 00:00:00 2001
From: m-holger <m-holger@kubitscheck.org>
Date: Tue, 2 Aug 2022 16:20:24 +0100
Subject: Modify newIndirect to set QPDFObjectHandle::obj

---
 libqpdf/QPDFObjectHandle.cc | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'libqpdf/QPDFObjectHandle.cc')

diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index 8c98c87b..f872e984 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -21,6 +21,7 @@
 #include <qpdf/QPDF_Reserved.hh>
 #include <qpdf/QPDF_Stream.hh>
 #include <qpdf/QPDF_String.hh>
+#include <qpdf/QPDF_Unresolved.hh>
 #include <qpdf/SparseOHArray.hh>
 
 #include <qpdf/QIntC.hh>
@@ -240,13 +241,6 @@ QPDFObjectHandle::QPDFObjectHandle() :
 {
 }
 
-QPDFObjectHandle::QPDFObjectHandle(QPDF* qpdf, QPDFObjGen const& og) :
-    initialized(true),
-    qpdf(qpdf),
-    og(og)
-{
-}
-
 QPDFObjectHandle::QPDFObjectHandle(std::shared_ptr<QPDFObject> const& data) :
     initialized(true),
     qpdf(nullptr),
@@ -1953,7 +1947,7 @@ QPDFObjectHandle::newIndirect(QPDF* qpdf, QPDFObjGen const& og)
         return newNull();
     }
 
-    return QPDFObjectHandle(qpdf, og);
+    return QPDFObjectHandle(qpdf, og, QPDF_Unresolved::create());
 }
 
 QPDFObjectHandle
@@ -2553,10 +2547,11 @@ QPDFObjectHandle::dereference()
     if (!this->initialized) {
         return false;
     }
-    if (this->obj() == nullptr ||
+    if ((this->obj->getTypeCode() == QPDFObject::ot_unresolved) ||
         (getObjectID() &&
          QPDF::Resolver::objectChanged(this->qpdf, getObjGen(), this->obj))) {
-        obj = QPDF::Resolver::resolve(this->qpdf, getObjGen());
+        this->obj = QPDF::Resolver::resolve(this->qpdf, getObjGen());
+
     }
     return true;
 }
-- 
cgit v1.2.3-54-g00ecf