Merge pull request #717 from WilhelmWiens/Realloc

Add realloc

Author: akheron

CMakeLists.txt

@@ -491,6 +491,7 @@ if (NOT JANSSON_WITHOUT_TESTS)
    set(api_tests
          test_array
          test_chaos
+         test_chaos_realloc
          test_copy
          test_dump
          test_dump_callback
@@ -510,6 +511,7 @@ if (NOT JANSSON_WITHOUT_TESTS)
    # such as secure_malloc and secure_free is doing, so exclude it for now.
    if (NOT MSVC)
       list(APPEND api_tests test_memory_funcs)
+      list(APPEND api_tests test_memory_funcs_realloc)
    endif()
 
    # Helper macro for building and linking a test program.

doc/apiref.rst

@@ -1907,7 +1907,7 @@ Copying objects preserves the insertion order of keys.
 Custom Memory Allocation
 ========================
 
-By default, Jansson uses :func:`malloc()` and :func:`free()` for
+By default, Jansson uses :func:`malloc()`, :func:`realloc()` and :func:`free()` for
 memory allocation. These functions can be overridden if custom
 behavior is needed.
 
@@ -1918,6 +1918,16 @@ behavior is needed.
 
        typedef void *(*json_malloc_t)(size_t);
 
+.. type:: json_realloc_t
+
+   A typedef for a function pointer with :func:`realloc()`'s
+   signature::
+
+       typedef void *(*json_realloc_t)(void*, size_t);
+
+
+   .. versionadded:: 2.15
+
 .. type:: json_free_t
 
    A typedef for a function pointer with :func:`free()`'s
@@ -1932,13 +1942,29 @@ behavior is needed.
    Jansson's API functions to ensure that all memory operations use
    the same functions.
 
+.. function:: void json_set_alloc_funcs2(json_malloc_t malloc_fn, json_relloc_t relloc_fn, json_free_t free_fn)
+
+   Use *malloc_fn* instead of :func:`malloc()`, *realloc_fn* instead of :func:`realloc()` and *free_fn* instead
+   of :func:`free()`. This function has to be called before any other
+   Jansson's API functions to ensure that all memory operations use
+   the same functions.
+
+   .. versionadded:: 2.15
+
 .. function:: void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn)
 
    Fetch the current malloc_fn and free_fn used. Either parameter
    may be NULL.
 
    .. versionadded:: 2.8
 
+.. function:: void json_get_alloc_funcs2(json_malloc_t *malloc_fn, json_realloc_t *realloc_fn, json_free_t *free_fn)
+
+   Fetch the current malloc_fn,realloc_fn and free_fn used. Either parameter
+   may be NULL.
+
+   .. versionadded:: 2.15
+
 **Examples:**
 
 Circumvent problems with different CRT heaps on Windows by using
@@ -1950,6 +1976,12 @@ Use the `Boehm's conservative garbage collector`_ for memory
 operations::
 
     json_set_alloc_funcs(GC_malloc, GC_free);
+         or
+    json_set_alloc_funcs2(GC_malloc, GC_realloc, GC_free);
+
+
+   When realloc is not defined is it emulated using malloc and free.
+
 
 .. _Boehm's conservative garbage collector: http://www.hboehm.info/gc/
 

src/hashtable.c

@@ -154,7 +154,7 @@ static int hashtable_do_rehash(hashtable_t *hashtable) {
     hashtable->buckets = new_buckets;
     hashtable->order = new_order;
 
-    for (i = 0; i < hashsize(hashtable->order); i++) {
+    for (i = 0; i < new_size; i++) {
         hashtable->buckets[i].first = hashtable->buckets[i].last = &hashtable->list;
     }
 

src/jansson.def

@@ -77,7 +77,9 @@ EXPORTS
     json_unpack_ex
     json_vunpack_ex
     json_set_alloc_funcs
+    json_set_alloc_funcs2
     json_get_alloc_funcs
+    json_get_alloc_funcs2
     jansson_version_str
     jansson_version_cmp
 

src/jansson.h

@@ -402,11 +402,17 @@ int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *
 /* custom memory allocation */
 
 typedef void *(*json_malloc_t)(size_t);
+typedef void *(*json_realloc_t)(void *, size_t);
 typedef void (*json_free_t)(void *);
 
 void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn);
 void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn);
 
+void json_set_alloc_funcs2(json_malloc_t malloc_fn, json_realloc_t realloc_fn,
+                           json_free_t free_fn);
+void json_get_alloc_funcs2(json_malloc_t *malloc_fn, json_realloc_t *realloc_fn,
+                           json_free_t *free_fn);
+
 /* runtime version checking */
 
 const char *jansson_version_str(void);

src/jansson_private.h

@@ -83,6 +83,8 @@ int jsonp_dtostr(char *buffer, size_t size, double value, int prec);
 
 /* Wrappers for custom memory functions */
 void *jsonp_malloc(size_t size) JANSSON_ATTRS((warn_unused_result));
+void *jsonp_realloc(void *ptr, size_t originalSize, size_t newSize)
+    JANSSON_ATTRS((warn_unused_result));
 void jsonp_free(void *ptr);
 char *jsonp_strndup(const char *str, size_t length) JANSSON_ATTRS((warn_unused_result));
 char *jsonp_strdup(const char *str) JANSSON_ATTRS((warn_unused_result));

src/memory.c

@@ -14,10 +14,12 @@
 
 /* C89 allows these to be macros */
 #undef malloc
+#undef realloc
 #undef free
 
 /* memory function pointers */
 static json_malloc_t do_malloc = malloc;
+static json_realloc_t do_realloc = realloc;
 static json_free_t do_free = free;
 
 void *jsonp_malloc(size_t size) {
@@ -34,6 +36,31 @@ void jsonp_free(void *ptr) {
     (*do_free)(ptr);
 }
 
+void *jsonp_realloc(void *ptr, size_t originalSize, size_t newSize) {
+    void *newMemory;
+
+    if (do_realloc)
+        return (*do_realloc)(ptr, newSize);
+
+    // realloc emulation using malloc and free
+    if (newSize == 0) {
+        if (ptr != NULL)
+            (*do_free)(ptr);
+
+        return NULL;
+    } else {
+        newMemory = (*do_malloc)(newSize);
+
+        if ((newMemory != NULL) && (ptr != NULL)) {
+            memcpy(newMemory, ptr, (originalSize < newSize) ? originalSize : newSize);
+
+            (*do_free)(ptr);
+        }
+
+        return newMemory;
+    }
+}
+
 char *jsonp_strdup(const char *str) { return jsonp_strndup(str, strlen(str)); }
 
 char *jsonp_strndup(const char *str, size_t len) {
@@ -50,6 +77,14 @@ char *jsonp_strndup(const char *str, size_t len) {
 
 void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn) {
     do_malloc = malloc_fn;
+    do_realloc = NULL;
+    do_free = free_fn;
+}
+
+void json_set_alloc_funcs2(json_malloc_t malloc_fn, json_realloc_t realloc_fn,
+                           json_free_t free_fn) {
+    do_malloc = malloc_fn;
+    do_realloc = realloc_fn;
     do_free = free_fn;
 }
 
@@ -59,3 +94,12 @@ void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn) {
     if (free_fn)
         *free_fn = do_free;
 }
+void json_get_alloc_funcs2(json_malloc_t *malloc_fn, json_realloc_t *realloc_fn,
+                           json_free_t *free_fn) {
+    if (malloc_fn)
+        *malloc_fn = do_malloc;
+    if (realloc_fn)
+        *realloc_fn = do_realloc;
+    if (free_fn)
+        *free_fn = do_free;
+}

src/strbuffer.c

@@ -70,13 +70,10 @@ int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size)
 
         new_size = max(strbuff->size * STRBUFFER_FACTOR, strbuff->length + size + 1);
 
-        new_value = jsonp_malloc(new_size);
+        new_value = jsonp_realloc(strbuff->value, strbuff->size, new_size);
         if (!new_value)
             return -1;
 
-        memcpy(new_value, strbuff->value, strbuff->length);
-
-        jsonp_free(strbuff->value);
         strbuff->value = new_value;
         strbuff->size = new_size;
     }

src/value.c

@@ -507,7 +507,7 @@ static void array_copy(json_t **dest, size_t dpos, json_t **src, size_t spos,
     memcpy(&dest[dpos], &src[spos], count * sizeof(json_t *));
 }
 
-static json_t **json_array_grow(json_array_t *array, size_t amount, int copy) {
+static json_t **json_array_grow(json_array_t *array, size_t amount) {
     size_t new_size;
     json_t **old_table, **new_table;
 
@@ -517,20 +517,15 @@ static json_t **json_array_grow(json_array_t *array, size_t amount, int copy) {
     old_table = array->table;
 
     new_size = max(array->size + amount, array->size * 2);
-    new_table = jsonp_malloc(new_size * sizeof(json_t *));
+    new_table = jsonp_realloc(old_table, array->size * sizeof(json_t *),
+                              new_size * sizeof(json_t *));
     if (!new_table)
         return NULL;
 
     array->size = new_size;
     array->table = new_table;
 
-    if (copy) {
-        array_copy(array->table, 0, old_table, 0, array->entries);
-        jsonp_free(old_table);
-        return array->table;
-    }
-
-    return old_table;
+    return array->table;
 }
 
 int json_array_append_new(json_t *json, json_t *value) {
@@ -545,7 +540,7 @@ int json_array_append_new(json_t *json, json_t *value) {
     }
     array = json_to_array(json);
 
-    if (!json_array_grow(array, 1, 1)) {
+    if (!json_array_grow(array, 1)) {
         json_decref(value);
         return -1;
     }
@@ -558,7 +553,6 @@ int json_array_append_new(json_t *json, json_t *value) {
 
 int json_array_insert_new(json_t *json, size_t index, json_t *value) {
     json_array_t *array;
-    json_t **old_table;
 
     if (!value)
         return -1;
@@ -574,17 +568,11 @@ int json_array_insert_new(json_t *json, size_t index, json_t *value) {
         return -1;
     }
 
-    old_table = json_array_grow(array, 1, 0);
-    if (!old_table) {
+    if (!json_array_grow(array, 1)) {
         json_decref(value);
         return -1;
     }
-
-    if (old_table != array->table) {
-        array_copy(array->table, 0, old_table, 0, index);
-        array_copy(array->table, index + 1, old_table, index, array->entries - index);
-        jsonp_free(old_table);
-    } else
+    if (index != array->entries)
         array_move(array, index + 1, index, array->entries - index);
 
     array->table[index] = value;
@@ -638,7 +626,7 @@ int json_array_extend(json_t *json, json_t *other_json) {
     array = json_to_array(json);
     other = json_to_array(other_json);
 
-    if (!json_array_grow(array, other->entries, 1))
+    if (!json_array_grow(array, other->entries))
         return -1;
 
     for (i = 0; i < other->entries; i++)

test/.gitignore

@@ -2,6 +2,7 @@ logs
 bin/json_process
 suites/api/test_array
 suites/api/test_chaos
+suites/api/test_chaos_realloc
 suites/api/test_copy
 suites/api/test_cpp
 suites/api/test_dump
@@ -12,6 +13,7 @@ suites/api/test_load
 suites/api/test_load_callback
 suites/api/test_loadb
 suites/api/test_memory_funcs
+suites/api/test_memory_funcs_realloc
 suites/api/test_number
 suites/api/test_object
 suites/api/test_pack