allow nullptr when not care the removed array value

MatthiasMichel · Jul 3, 2018 · e32ee47 · e32ee47
1 parent 80bc776
commit e32ee47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/include/json/value.h b/include/json/value.h
@@ -562,7 +562,7 @@ Json::Value obj_value(Json::objectValue); // {}
   /** \brief Remove the indexed array element.
 
       O(n) expensive operations.
-      Update 'removed' if removed.
+      Update 'removed' iff removed.
       \return true if removed (no exceptions)
   */
   bool removeIndex(ArrayIndex index, Value* removed);

diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
@@ -1243,7 +1243,8 @@ bool Value::removeIndex(ArrayIndex index, Value* removed) {
   if (it == value_.map_->end()) {
     return false;
   }
-  *removed = it->second;
+  if (removed)
+    *removed = it->second;
   ArrayIndex oldSize = size();
   // shift left all items left, into the place of the "removed"
   for (ArrayIndex i = index; i < (oldSize - 1); ++i) {