diff options
author | Jay Berkenbilt <ejb@ql.org> | 2010-06-06 15:32:08 +0200 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2010-06-06 15:32:08 +0200 |
commit | 9496b2cb20bfd0551e9510b6ccb41ca950d2c8ee (patch) | |
tree | d4dd988984a8730331087b8b7e7afc513aeb2164 /include | |
parent | 64dc738859bac0dd71a3b0e61ba2d2c171d9eecd (diff) | |
download | qpdf-9496b2cb20bfd0551e9510b6ccb41ca950d2c8ee.tar.zst |
fix memory leak
git-svn-id: svn+q:///qpdf/trunk@976 71b93d88-0707-0410-a8cf-f5a4172ac649
Diffstat (limited to 'include')
-rw-r--r-- | include/qpdf/QPDFObject.hh | 22 | ||||
-rw-r--r-- | include/qpdf/QPDFObjectHandle.hh | 17 |
2 files changed, 39 insertions, 0 deletions
diff --git a/include/qpdf/QPDFObject.hh b/include/qpdf/QPDFObject.hh index 26b15ef9..b366c33f 100644 --- a/include/qpdf/QPDFObject.hh +++ b/include/qpdf/QPDFObject.hh @@ -12,11 +12,33 @@ #include <string> +class QPDF; +class QPDFObjectHandle; + class QPDFObject { public: virtual ~QPDFObject() {} virtual std::string unparse() = 0; + + // Accessor to give specific access to non-public methods + class ObjAccessor + { + friend class QPDF; + friend class QPDFObjectHandle; + private: + static void releaseResolved(QPDFObject* o) + { + if (o) + { + o->releaseResolved(); + } + } + }; + friend class ObjAccessor; + + protected: + virtual void releaseResolved() {} }; #endif // __QPDFOBJECT_HH__ diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index a62c85ab..7feb602d 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -22,6 +22,8 @@ class Pipeline; class QPDF; +class QPDF_Dictionary; +class QPDF_Array; class QPDFObjectHandle { @@ -247,6 +249,20 @@ class QPDFObjectHandle }; friend class ObjAccessor; + // Provide access to specific classes for recursive + // reverseResolved(). + class ReleaseResolver + { + friend class QPDF_Dictionary; + friend class QPDF_Array; + private: + static void releaseResolved(QPDFObjectHandle& o) + { + o.releaseResolved(); + } + }; + friend class ReleaseResolver; + private: QPDFObjectHandle(QPDF*, int objid, int generation); QPDFObjectHandle(QPDFObject*); @@ -262,6 +278,7 @@ class QPDFObjectHandle void assertPageObject(); void dereference(); void makeDirectInternal(std::set<int>& visited); + void releaseResolved(); bool initialized; |