Refactor `NNTree::deepen`: introduce lambda for failure handling, simplify loop …

…logic, and replace redundant code with subscript operators.

Refactor `NNTree::deepen`: introduce lambda for failure handling, simplify loop …
…logic, and replace redundant code with subscript operators.
m-holger
1 parent baa77f54
Showing 2 changed files with 23 additions and 39 deletions
libqpdf/NNTree.cc
qpdf/qpdf.testcov
@@ -592,74 +592,64 @@ NNTreeIterator::deepen(QPDFObjectHandle a_node, bool first, bool allow_empty)
     // items. If we succeed, return true; otherwise return false and leave path alone.
     auto opath = path;
-    bool failed = false;
+
+    auto fail = [this, &opath](QPDFObjectHandle const& failed_node, std::string const& msg) {
+        impl.warn(failed_node, msg);
+        path = opath;
+        return false;
+    };
     QPDFObjGen::set seen;
     for (auto const& i: path) {
         seen.add(i.node);
     }
-    while (!failed) {
+    while (true) {
         if (!seen.add(a_node)) {
-            QTC::TC("qpdf", "NNTree deepen: loop");
-            impl.warn(a_node, "loop detected while traversing name/number tree");
-            failed = true;
-            break;
+            return fail(a_node, "loop detected while traversing name/number tree");
         }
         if (!a_node.isDictionary()) {
-            QTC::TC("qpdf", "NNTree node is not a dictionary");
-            impl.warn(a_node, "non-dictionary node while traversing name/number tree");
-            failed = true;
-            break;
+            return fail(a_node, "non-dictionary node while traversing name/number tree");
         }
-        auto kids = a_node.getKey("/Kids");
-        int nkids = kids.isArray() ? kids.getArrayNItems() : 0;
         auto items = a_node.getKey(impl.details.itemsKey());
-        int nitems = items.isArray() ? items.getArrayNItems() : 0;
-        if (nitems > 0) {
+        int nitems = static_cast<int>(items.size());
+        if (nitems > 1) {
             setItemNumber(a_node, first ? 0 : nitems - 2);
             break;
-        } else if (nkids > 0) {
+        }
+
+        auto kids = a_node.getKey("/Kids");
+        int nkids = kids.isArray() ? static_cast<int>(kids.size()) : 0;
+        if (nkids > 0) {
             int kid_number = first ? 0 : nkids - 1;
             addPathElement(a_node, kid_number);
-            auto next = kids.getArrayItem(kid_number);
+            auto next = kids[kid_number];
             if (!next.isIndirect()) {
                 if (impl.auto_repair) {
-                    QTC::TC("qpdf", "NNTree fix indirect kid");
                     impl.warn(
                         a_node,
-                        ("converting kid number " + std::to_string(kid_number) +
-                         " to an indirect object"));
+                        "converting kid number " + std::to_string(kid_number) +
+                            " to an indirect object");
                     next = impl.qpdf.makeIndirectObject(next);
                     kids.setArrayItem(kid_number, next);
                 } else {
-                    QTC::TC("qpdf", "NNTree warn indirect kid");
                     impl.warn(
                         a_node,
-                        ("kid number " + std::to_string(kid_number) +
-                         " is not an indirect object"));
+                        "kid number " + std::to_string(kid_number) + " is not an indirect object");
                 }
             }
             a_node = next;
         } else if (allow_empty && items.isArray()) {
-            QTC::TC("qpdf", "NNTree deepen found empty");
             setItemNumber(a_node, -1);
             break;
         } else {
-            QTC::TC("qpdf", "NNTree deepen: invalid node");
-            impl.warn(
+            return fail(
                 a_node,
-                ("name/number tree node has neither non-empty " + impl.details.itemsKey() +
-                 " nor /Kids"));
-            failed = true;
-            break;
+                "name/number tree node has neither non-empty " + impl.details.itemsKey() +
+                    " nor /Kids");
         }
     }
-    if (failed) {
-        path = opath;
-        return false;
-    }
     return true;
 }
@@ -519,15 +519,10 @@ qpdf-c called qpdf_oh_unparse_resolved 0
 qpdf-c called qpdf_oh_unparse_binary 0
 QPDFWriter getFilterOnWrite false 0
 QPDFPageObjectHelper::forEachXObject 3
-NNTree deepen: invalid node 0
-NNTree deepen: loop 0
 NNTree skip invalid kid 0
 NNTree skip item at end of short items 0
 NNTree skip invalid key 0
-NNTree deepen found empty 0
 NNTree unable to determine limits 0
-NNTree warn indirect kid 0
-NNTree fix indirect kid 0
 NNTree repair 0
 NNTree split root + leaf 0
 NNTree split root + !leaf 0
@@ -536,7 +531,6 @@ NNTree split items 0
 NNTree split second half item 0
 NNTree split parent 0
 NNTree split second half kid 0
-NNTree node is not a dictionary 0
 NNTree limits didn't change 0
 NNTree increment end() 0
 NNTree insertAfter inserts first 0