blobmsg: make blobmsg_len and blobmsg_data_len return unsigned value

[project/libubox.git] / blobmsg.c

diff --git a/blobmsg.c b/blobmsg.c
index 9fe96e44c8509eedd17189e1710f52cacb4271e0..1a8b783e9ba92b35aff2b1a3ad6912a903b704e1 100644 (file)
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -20,6 +20,7 @@ static const int blob_type[__BLOBMSG_TYPE_LAST] = {
        [BLOBMSG_TYPE_INT16] = BLOB_ATTR_INT16,
        [BLOBMSG_TYPE_INT32] = BLOB_ATTR_INT32,
        [BLOBMSG_TYPE_INT64] = BLOB_ATTR_INT64,
+       [BLOBMSG_TYPE_DOUBLE] = BLOB_ATTR_DOUBLE,
        [BLOBMSG_TYPE_STRING] = BLOB_ATTR_STRING,
        [BLOBMSG_TYPE_UNSPEC] = BLOB_ATTR_BINARY,
 };
@@ -34,7 +35,8 @@ bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
 {
        const struct blobmsg_hdr *hdr;
        const char *data;
-       int id, len;
+       size_t len;
+       int id;
 
        if (blob_len(attr) < sizeof(struct blobmsg_hdr))
                return false;
@@ -66,7 +68,7 @@ int blobmsg_check_array(const struct blob_attr *attr, int type)
 {
        struct blob_attr *cur;
        bool name;
-       int rem;
+       size_t rem;
        int size = 0;
 
        switch (blobmsg_type(attr)) {
@@ -134,6 +136,8 @@ int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
        int i;
 
        memset(tb, 0, policy_len * sizeof(*tb));
+       if (!data || !len)
+               return -EINVAL;
        pslen = alloca(policy_len);
        for (i = 0; i < policy_len; i++) {
                if (!policy[i].name)
@@ -227,29 +231,38 @@ blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array)
        return (void *)offset;
 }
 
-void
-blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg)
+__attribute__((format(printf, 3, 0)))
+int blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg)
 {
        va_list arg2;
        char cbuf;
-       int len;
+       char *sbuf;
+       int len, ret;
 
        va_copy(arg2, arg);
        len = vsnprintf(&cbuf, sizeof(cbuf), format, arg2);
        va_end(arg2);
 
-       vsprintf(blobmsg_alloc_string_buffer(buf, name, len + 1), format, arg);
+       sbuf = blobmsg_alloc_string_buffer(buf, name, len + 1);
+       if (!sbuf)
+               return -1;
+       ret = vsprintf(sbuf, format, arg);
        blobmsg_add_string_buffer(buf);
+
+       return ret;
 }
 
-void
-blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
+__attribute__((format(printf, 3, 4)))
+int blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
 {
        va_list ap;
+       int ret;
 
        va_start(ap, format);
-       blobmsg_vprintf(buf, name, format, ap);
+       ret = blobmsg_vprintf(buf, name, format, ap);
        va_end(ap);
+
+       return ret;
 }
 
 void *
@@ -262,7 +275,6 @@ blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, unsigned int
        if (!attr)
                return NULL;
 
-       data_dest = blobmsg_data(attr);
        blob_set_raw_len(buf->head, blob_pad_len(buf->head) - blob_pad_len(attr));
        blob_set_raw_len(attr, blob_raw_len(attr) - maxlen);
 
@@ -279,7 +291,8 @@ blobmsg_realloc_string_buffer(struct blob_buf *buf, unsigned int maxlen)
        if (required <= 0)
                goto out;
 
-       blob_buf_grow(buf, required);
+       if (!blob_buf_grow(buf, required))
+               return NULL;
        attr = blob_next(buf->head);
 
 out: