Fix various memory management issues

[project/libubox.git] / blobmsg_json.c

diff --git a/blobmsg_json.c b/blobmsg_json.c
index ffde23d..2e318b2 100644 (file)
--- a/blobmsg_json.c
+++ b/blobmsg_json.c
@@ -49,9 +49,6 @@ bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object
        bool ret = true;
        void *c;
 
-       if (!obj)
-               return false;
-
        switch (json_object_get_type(obj)) {
        case json_type_object:
                c = blobmsg_open_table(b, name);
@@ -72,6 +69,9 @@ bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object
        case json_type_int:
                blobmsg_add_u32(b, name, json_object_get_int(obj));
                break;
+       case json_type_null:
+               blobmsg_add_field(b, BLOBMSG_TYPE_UNSPEC, name, NULL, 0);
+               break;
        default:
                return false;
        }
@@ -119,15 +119,22 @@ struct strbuf {
 
 static bool blobmsg_puts(struct strbuf *s, const char *c, int len)
 {
+       size_t new_len;
+       char *new_buf;
+
        if (len <= 0)
                return true;
 
        if (s->pos + len >= s->len) {
-               s->len += 16 + len;
-               s->buf = realloc(s->buf, s->len);
-               if (!s->buf)
+               new_len = s->len + 16 + len;
+               new_buf = realloc(s->buf, new_len);
+               if (!new_buf)
                        return false;
+
+               s->len = new_len;
+               s->buf = new_buf;
        }
+
        memcpy(s->buf + s->pos, c, len);
        s->pos += len;
        return true;
@@ -135,21 +142,17 @@ static bool blobmsg_puts(struct strbuf *s, const char *c, int len)
 
 static void add_separator(struct strbuf *s)
 {
-       static char indent_chars[17] = "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-       int indent;
-       char *start;
+       const char *indent_chars = "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+       int len;
 
        if (!s->indent)
                return;
 
-       indent = s->indent_level;
-       if (indent > 16)
-               indent = 16;
+       len = s->indent_level + 1;
+       if (len > strlen(indent_chars))
+               len = strlen(indent_chars);
 
-       start = &indent_chars[sizeof(indent_chars) - indent - 1];
-       *start = '\n';
-       blobmsg_puts(s, start, indent + 1);
-       *start = '\t';
+       blobmsg_puts(s, indent_chars, len);
 }
 
 
@@ -294,14 +297,18 @@ char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_jso
 {
        struct strbuf s;
        bool array;
+       char *ret;
 
        s.len = blob_len(attr);
-       s.buf = malloc(s.len);
        s.pos = 0;
        s.custom_format = cb;
        s.priv = priv;
        s.indent = false;
 
+       s.buf = malloc(s.len);
+       if (!s.buf)
+               return NULL;
+
        if (indent >= 0) {
                s.indent = true;
                s.indent_level = indent;
@@ -320,8 +327,13 @@ char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_jso
                return NULL;
        }
 
-       s.buf = realloc(s.buf, s.pos + 1);
-       s.buf[s.pos] = 0;
+       ret = realloc(s.buf, s.pos + 1);
+       if (!ret) {
+               free(s.buf);
+               return NULL;
+       }
+
+       ret[s.pos] = 0;
 
-       return s.buf;
+       return ret;
 }