Sync with 2.13.2

diff --git a/object.c b/object.c
index 06ba3a11d87ad7b93f29aef535e773fcc4683004..f818777412187890b88a6c90507b8b41f131487c 100644 (file)
--- a/object.c
+++ b/object.c
@@ -377,8 +377,7 @@ void object_array_clear(struct object_array *array)
        int i;
        for (i = 0; i < array->nr; i++)
                object_array_release_entry(&array->objects[i]);
-       free(array->objects);
-       array->objects = NULL;
+       FREE_AND_NULL(array->objects);
        array->nr = array->alloc = 0;
 }