diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2020-10-22 11:11:58 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2020-10-22 11:48:35 +0200 |
| commit | 24196c08cb2457ab3e7a6d0226e6c28ac55bb832 (patch) | |
| tree | a098a2b2681a03d763f8c2f8431457869347a426 /libqpdf/QPDF_optimization.cc | |
| parent | 6cc9489fd85fe0b89a06ef73ab0186d1e6e026c0 (diff) | |
| download | qpdf-24196c08cb2457ab3e7a6d0226e6c28ac55bb832.tar.zst | |
Fix loop detection error (fuzz issue 23172)
Diffstat (limited to 'libqpdf/QPDF_optimization.cc')
| -rw-r--r-- | libqpdf/QPDF_optimization.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libqpdf/QPDF_optimization.cc b/libqpdf/QPDF_optimization.cc index afa7ccbd..05cac415 100644 --- a/libqpdf/QPDF_optimization.cc +++ b/libqpdf/QPDF_optimization.cc @@ -354,12 +354,13 @@ void QPDF::updateObjectMaps(ObjUser const& ou, QPDFObjectHandle oh) { std::set<QPDFObjGen> visited; - updateObjectMapsInternal(ou, oh, visited, true); + updateObjectMapsInternal(ou, oh, visited, true, 0); } void QPDF::updateObjectMapsInternal(ObjUser const& ou, QPDFObjectHandle oh, - std::set<QPDFObjGen>& visited, bool top) + std::set<QPDFObjGen>& visited, bool top, + int depth) { // Traverse the object tree from this point taking care to avoid // crossing page boundaries. @@ -397,7 +398,8 @@ QPDF::updateObjectMapsInternal(ObjUser const& ou, QPDFObjectHandle oh, int n = oh.getArrayNItems(); for (int i = 0; i < n; ++i) { - updateObjectMapsInternal(ou, oh.getArrayItem(i), visited, false); + updateObjectMapsInternal( + ou, oh.getArrayItem(i), visited, false, 1 + depth); } } else if (oh.isDictionary() || oh.isStream()) @@ -417,8 +419,9 @@ QPDF::updateObjectMapsInternal(ObjUser const& ou, QPDFObjectHandle oh, { // Traverse page thumbnail dictionaries as a special // case. - updateObjectMaps(ObjUser(ObjUser::ou_thumb, ou.pageno), - dict.getKey(key)); + updateObjectMapsInternal( + ObjUser(ObjUser::ou_thumb, ou.pageno), + dict.getKey(key), visited, false, 1 + depth); } else if (is_page_node && (key == "/Parent")) { @@ -426,8 +429,8 @@ QPDF::updateObjectMapsInternal(ObjUser const& ou, QPDFObjectHandle oh, } else { - updateObjectMapsInternal(ou, dict.getKey(key), - visited, false); + updateObjectMapsInternal( + ou, dict.getKey(key), visited, false, 1 + depth); } } } |