Merge pull request #719 from WilhelmWiens/json_dumps_avoidDuplicatingString

Json dumps avoid duplicating string

Author: akheron

src/dump.c

@@ -431,8 +431,15 @@ char *json_dumps(const json_t *json, size_t flags) {
 
     if (json_dump_callback(json, dump_to_strbuffer, (void *)&strbuff, flags))
         result = NULL;
-    else
-        result = jsonp_strdup(strbuffer_value(&strbuff));
+    else {
+        char *new_result;
+        result = strbuffer_steal_value(&strbuff);
+        // technically the resizing is not needed.
+        new_result = jsonp_realloc(result, strbuff.size, strbuff.length + 1);
+        if (new_result) { // when realloc fails we just use the original pointer
+            result = new_result;
+        }
+    }
 
     strbuffer_close(&strbuff);
     return result;

src/jansson_private.h

@@ -86,8 +86,6 @@ 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));
 char *jsonp_strndup(const char *str, size_t len) JANSSON_ATTRS((warn_unused_result));
 
 /* Circular reference check*/

src/memory.c

@@ -61,8 +61,6 @@ void *jsonp_realloc(void *ptr, size_t originalSize, size_t newSize) {
     }
 }
 
-char *jsonp_strdup(const char *str) { return jsonp_strndup(str, strlen(str)); }
-
 char *jsonp_strndup(const char *str, size_t len) {
     char *new_str;