Add `Array::insert` overload with size_t for consistency, refactor logic, and im…

…prove bounds checking

Add `Array::insert` overload with size_t for consistency, refactor logic, and im…
…prove bounds checking
m-holger
1 parent b1d5a928
Showing 2 changed files with 27 additions and 21 deletions
libqpdf/QPDF_Array.cc
libqpdf/qpdf/QPDFObjectHandle_private.hh
@@ -285,43 +285,48 @@ Array::setFromVector(std::vector&lt;QPDFObjectHandle&gt; const&amp; v)
 }
  
 bool
-Array::insert(int at_i, QPDFObjectHandle const& item)
+Array::insert(size_t at, QPDFObjectHandle const& item)
 {
     auto a = array();
     size_t sz = size();
-    if (at_i < 0) {
-        return false;
-    }
-    size_t at = to_s(at_i);
     if (at > sz) {
         return false;
     }
+    checkOwnership(item);
     if (at == sz) {
         // As special case, also allow insert beyond the end
         push_back(item);
         return true;
     }
-    checkOwnership(item);
-    if (a->sp) {
-        auto iter = a->sp->elements.crbegin();
-        while (iter != a->sp->elements.crend()) {
-            auto key = (iter++)->first;
-            if (key >= at) {
-                auto nh = a->sp->elements.extract(key);
-                ++nh.key();
-                a->sp->elements.insert(std::move(nh));
-            } else {
-                break;
-            }
+    if (!a->sp) {
+        a->elements.insert(a->elements.cbegin() + to_i(at), item);
+        return true;
+    }
+    auto iter = a->sp->elements.crbegin();
+    while (iter != a->sp->elements.crend()) {
+        auto key = (iter++)->first;
+        if (key >= at) {
+            auto nh = a->sp->elements.extract(key);
+            ++nh.key();
+            a->sp->elements.insert(std::move(nh));
+        } else {
+            break;
         }
-        a->sp->elements[at] = item;
-        ++a->sp->size;
-    } else {
-        a->elements.insert(a->elements.cbegin() + at_i, item);
     }
+    a->sp->elements[at] = item;
+    ++a->sp->size;
     return true;
 }
  
+bool
+Array::insert(int at_i, QPDFObjectHandle const& item)
+{
+    if (at_i < 0) {
+        return false;
+    }
+    return insert(to_s(at_i), item);
+}
+
 void
 Array::push_back(QPDFObjectHandle const& item)
 {
@@ -96,6 +96,7 @@ namespace qpdf
         QPDFObjectHandle get(int n) const;
         bool set(size_t at, QPDFObjectHandle const& oh);
         bool set(int at, QPDFObjectHandle const& oh);
+        bool insert(size_t at, QPDFObjectHandle const& item);
         bool insert(int at, QPDFObjectHandle const& item);
         void push_back(QPDFObjectHandle const& item);
         bool erase(int at);