Merge branch '2.4'

2012-12-04 09:33:48 +02:00
parent 6279610ce4 54d59c743c
commit 7b35a18ac0
2 changed files with 18 additions and 1 deletions
--- a/src/value.c
+++ b/src/value.c
@@ -509,7 +509,10 @@ int json_array_remove(json_t *json, size_t index)

    json_decref(array->table[index]);

-    array_move(array, index, index + 1, array->entries - index);
+    /* If we're removing the last element, nothing has to be moved */
+    if(index < array->entries - 1)
+        array_move(array, index, index + 1, array->entries - index);
+
    array->entries--;

    return 0;