Fix some memory leaks and invalid memory references

[jansson.git] / src / dump.c

diff --git a/src/dump.c b/src/dump.c
index 83f3812..e5af458 100644 (file)
--- a/src/dump.c
+++ b/src/dump.c
@@ -29,14 +29,6 @@ static int dump_to_file(const char *buffer, int size, void *data)
     return 0;
 }
 
-static int dump_to_fd(const char *buffer, int size, void *data)
-{
-    int *fd = (int *)data;
-    if(write(*fd, buffer, size) != size)
-        return -1;
-    return 0;
-}
-
 static int dump_indent(uint32_t flags, int depth, dump_func dump, void *data)
 {
     if(JSON_INDENT(flags) > 0)
@@ -54,8 +46,7 @@ static int dump_indent(uint32_t flags, int depth, dump_func dump, void *data)
         memset(ws_buffer, ' ', ws_count);
         return dump(ws_buffer, ws_count, data);
     }
-    else
-        return dump(" ", 1, data);
+    return 0;
 }
 
 static int dump_string(const char *str, dump_func dump, void *data)
@@ -66,27 +57,47 @@ static int dump_string(const char *str, dump_func dump, void *data)
         return -1;
 
     end = str;
-    while(*end)
+    while(1)
     {
-        while(*end && *end != '\\' && *end != '"')
+        const char *text;
+        char seq[7];
+        int length;
+
+        while(*end && *end != '\\' && *end != '"' && (*end < 0 || *end > 0x1F))
             end++;
 
-        if(end != str)
+        if(end != str) {
             if(dump(str, end - str, data))
                 return -1;
-
-        if(*end == '\\')
-        {
-            if(dump("\\\\", 2, data))
-                return -1;
-            end++;
         }
-        else if(*end == '"')
+
+        if(!*end)
+            break;
+
+        /* handle \, ", and control codes */
+        length = 2;
+        switch(*end)
         {
-            if(dump("\\\"", 2, data))
-                return -1;
-            end++;
+            case '\\': text = "\\\\"; break;
+            case '\"': text = "\\\""; break;
+            case '\b': text = "\\b"; break;
+            case '\f': text = "\\f"; break;
+            case '\n': text = "\\n"; break;
+            case '\r': text = "\\r"; break;
+            case '\t': text = "\\t"; break;
+            default:
+            {
+                sprintf(seq, "\\u00%02x", *end);
+                text = seq;
+                length = 6;
+                break;
+            }
         }
+
+        if(dump(text, length, data))
+            return -1;
+
+        end++;
         str = end;
     }
 
@@ -106,12 +117,26 @@ static int do_dump(const json_t *json, uint32_t flags, int depth,
         case JSON_FALSE:
             return dump("false", 5, data);
 
-        case JSON_NUMBER:
+        case JSON_INTEGER:
         {
             char *buffer;
             int size, ret;
 
-            size = asprintf(&buffer, "%.17f", json_number_value(json));
+            size = asprintf(&buffer, "%d", json_integer_value(json));
+            if(size == -1)
+                return -1;
+
+            ret = dump(buffer, size, data);
+            free(buffer);
+            return ret;
+        }
+
+        case JSON_REAL:
+        {
+            char *buffer;
+            int size, ret;
+
+            size = asprintf(&buffer, "%.17f", json_real_value(json));
             if(size == -1)
                 return -1;
 
@@ -131,7 +156,7 @@ static int do_dump(const json_t *json, uint32_t flags, int depth,
             if(dump("[", 1, data))
                 return -1;
             if(n == 0)
-                dump("]", 1, data);
+                return dump("]", 1, data);
             if(dump_indent(flags, depth + 1, dump, data))
                 return -1;
 
@@ -202,11 +227,16 @@ static int do_dump(const json_t *json, uint32_t flags, int depth,
 
 int json_dump(const json_t *json, const char *path, uint32_t flags)
 {
+    int result;
+
     FILE *output = fopen(path, "w");
     if(!output)
         return -1;
 
-    return json_dumpf(json, output, flags);
+    result = json_dumpf(json, output, flags);
+
+    fclose(output);
+    return result;
 }
 
 char *json_dumps(const json_t *json, uint32_t flags)
@@ -214,7 +244,8 @@ char *json_dumps(const json_t *json, uint32_t flags)
     strbuffer_t strbuff;
     char *result;
 
-    strbuffer_init(&strbuff);
+    if(strbuffer_init(&strbuff))
+      return NULL;
 
     if(do_dump(json, flags, 0, dump_to_strbuffer, (void *)&strbuff))
         return NULL;
@@ -222,7 +253,7 @@ char *json_dumps(const json_t *json, uint32_t flags)
     if(dump_to_strbuffer("\n", 1, (void *)&strbuff))
         return NULL;
 
-    result = strbuffer_value(&strbuff);
+    result = strdup(strbuffer_value(&strbuff));
     strbuffer_close(&strbuff);
 
     return result;
@@ -234,10 +265,3 @@ int json_dumpf(const json_t *json, FILE *output, uint32_t flags)
         return -1;
     return dump_to_file("\n", 1, (void *)output);
 }
-
-int json_dumpfd(const json_t *json, int fd, uint32_t flags)
-{
-    if(do_dump(json, flags, 0, dump_to_fd, (void *)&fd))
-        return -1;
-    return dump_to_fd("\n", 1, (void *)&fd);
-}