fix more instances of uninitialized padding bytes

[project/libubox.git] / blob.c

diff --git a/blob.c b/blob.c
index cafd74c..4817fd4 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -18,8 +18,11 @@
 static bool
 blob_buffer_grow(struct blob_buf *buf, int minlen)
 {
 static bool
 blob_buffer_grow(struct blob_buf *buf, int minlen)
 {

-       buf->buflen += ((minlen / 256) + 1) * 256;
+       int delta = ((minlen / 256) + 1) * 256;
+       buf->buflen += delta;

        buf->buf = realloc(buf->buf, buf->buflen);
        buf->buf = realloc(buf->buf, buf->buflen);

+       if (buf->buf)
+               memset(buf->buf + buf->buflen - delta, 0, delta);

        return !!buf->buf;
 }
 
        return !!buf->buf;
 }
 


@@ -64,6 +67,7 @@ blob_add(struct blob_buf *buf, struct blob_attr *pos, int id, int payload)
        }
 
        blob_init(attr, id, payload + sizeof(struct blob_attr));
        }
 
        blob_init(attr, id, payload + sizeof(struct blob_attr));

+       blob_fill_pad(attr);

        return attr;
 }
 
        return attr;
 }
 


@@ -80,6 +84,34 @@ blob_buf_init(struct blob_buf *buf, int id)
        return 0;
 }
 
        return 0;
 }
 

+void
+blob_buf_free(struct blob_buf *buf)
+{
+       free(buf->buf);
+       buf->buf = NULL;
+       buf->buflen = 0;
+}
+
+void
+blob_fill_pad(struct blob_attr *attr)
+{
+       char *buf = (char *) attr;
+       int len = blob_pad_len(attr);
+       int delta = len - blob_raw_len(attr);
+
+       if (delta > 0)
+               memset(buf + len - delta, 0, delta);
+}
+
+void
+blob_set_raw_len(struct blob_attr *attr, unsigned int len)
+{
+       int id = blob_id(attr);
+       len &= BLOB_ATTR_LEN_MASK;
+       len |= (id << BLOB_ATTR_ID_SHIFT) & BLOB_ATTR_ID_MASK;
+       attr->id_len = cpu_to_be32(len);
+}
+

 struct blob_attr *
 blob_new(struct blob_buf *buf, int id, int payload)
 {
 struct blob_attr *
 blob_new(struct blob_buf *buf, int id, int payload)
 {


@@ -132,9 +164,9 @@ static const int blob_type_minlen[BLOB_ATTR_LAST] = {
 };
 
 bool
 };
 
 bool

-blob_check_type(void *ptr, int len, int type)
+blob_check_type(const void *ptr, int len, int type)

 {
 {

-       char *data = ptr;
+       const char *data = ptr;

 
        if (type >= BLOB_ATTR_LAST)
                return false;
 
        if (type >= BLOB_ATTR_LAST)
                return false;


@@ -147,7 +179,7 @@ blob_check_type(void *ptr, int len, int type)
                        return false;
        }
 
                        return false;
        }
 

-       if (type == BLOB_ATTR_STRING && data[len] != 0)
+       if (type == BLOB_ATTR_STRING && data[len - 1] != 0)

                return false;
 
        return true;
                return false;
 
        return true;


@@ -193,3 +225,18 @@ blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_at
        }
        return found;
 }
        }
        return found;
 }

+
+bool
+blob_attr_equal(const struct blob_attr *a1, const struct blob_attr *a2)
+{
+       if (!a1 && !a2)
+               return true;
+
+       if (!a1 || !a2)
+               return false;
+
+       if (blob_pad_len(a1) != blob_pad_len(a2))
+               return false;
+
+       return !memcmp(a1, a2, blob_pad_len(a1));
+}