blobmsg: blobmsg_vprintf: prefer vsnprintf

[project/libubox.git] / blobmsg.c

diff --git a/blobmsg.c b/blobmsg.c
index 7cd0934600deac2f92c98a59cbc51cfa434a25a0..3e34821cc9284c64c9f220ab2b2de66b4c42a4a1 100644 (file)
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -25,12 +25,6 @@ static const int blob_type[__BLOBMSG_TYPE_LAST] = {
        [BLOBMSG_TYPE_UNSPEC] = BLOB_ATTR_BINARY,
 };
 
-static uint16_t
-blobmsg_namelen(const struct blobmsg_hdr *hdr)
-{
-       return be16_to_cpu(hdr->namelen);
-}
-
 bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
 {
        return blobmsg_check_attr_len(attr, name, blob_raw_len(attr));
@@ -101,7 +95,7 @@ bool blobmsg_check_attr_len(const struct blob_attr *attr, bool name, size_t len)
 
 int blobmsg_check_array(const struct blob_attr *attr, int type)
 {
-       return blobmsg_check_array_len(attr, type, blob_raw_len(attr));
+       return blobmsg_check_array_len(attr, type, blobmsg_len(attr));
 }
 
 int blobmsg_check_array_len(const struct blob_attr *attr, int type, size_t len)
@@ -246,7 +240,10 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v
        attr->id_len |= be32_to_cpu(BLOB_ATTR_EXTENDED);
        hdr = blob_data(attr);
        hdr->namelen = cpu_to_be16(namelen);
-       strcpy((char *) hdr->name, (const char *)name);
+
+       memcpy(hdr->name, name, namelen);
+       hdr->name[namelen] = '\0';
+
        pad_end = *data = blobmsg_data(attr);
        pad_start = (char *) &hdr->name[namelen];
        if (pad_start < pad_end)
@@ -293,10 +290,17 @@ int blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format,
        len = vsnprintf(&cbuf, sizeof(cbuf), format, arg2);
        va_end(arg2);
 
+       if (len < 0)
+               return -1;
+
        sbuf = blobmsg_alloc_string_buffer(buf, name, len + 1);
        if (!sbuf)
                return -1;
-       ret = vsprintf(sbuf, format, arg);
+
+       ret = vsnprintf(sbuf, len + 1, format, arg);
+       if (ret < 0)
+               return -1;
+
        blobmsg_add_string_buffer(buf);
 
        return ret;