fix more instances of uninitialized padding bytes

[project/libubox.git] / blob.h

diff --git a/blob.h b/blob.h
index 80ad7d0..b21c5bb 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -165,15 +165,6 @@ blob_pad_len(const struct blob_attr *attr)
        return len;
 }
 
-static inline 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);
-}
-
 static inline uint8_t
 blob_get_u8(const struct blob_attr *attr)
 {
@@ -213,15 +204,9 @@ blob_next(const struct blob_attr *attr)
        return (struct blob_attr *) ((char *) attr + blob_pad_len(attr));
 }
 
-static inline bool
-blob_attr_equal(const struct blob_attr *a1, const struct blob_attr *a2)
-{
-       if (blob_pad_len(a1) != blob_pad_len(a2))
-               return false;
-
-       return !memcmp(a1, a2, blob_pad_len(a1));
-}
-
+extern void blob_fill_pad(struct blob_attr *attr);
+extern void blob_set_raw_len(struct blob_attr *attr, unsigned int len);
+extern bool blob_attr_equal(const struct blob_attr *a1, const struct blob_attr *a2);
 extern int blob_buf_init(struct blob_buf *buf, int id);
 extern void blob_buf_free(struct blob_buf *buf);
 extern struct blob_attr *blob_new(struct blob_buf *buf, int id, int payload);
@@ -266,14 +251,14 @@ blob_put_int64(struct blob_buf *buf, int id, uint64_t val)
 
 #define __blob_for_each_attr(pos, attr, rem) \
        for (pos = (void *) attr; \
-                (blob_pad_len(pos) <= rem) && \
+                rem > 0 && (blob_pad_len(pos) <= rem) && \
                 (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
                 rem -= blob_pad_len(pos), pos = blob_next(pos))
 
 
 #define blob_for_each_attr(pos, attr, rem) \
        for (rem = blob_len(attr), pos = blob_data(attr); \
-                (blob_pad_len(pos) <= rem) && \
+                rem > 0 && (blob_pad_len(pos) <= rem) && \
                 (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
                 rem -= blob_pad_len(pos), pos = blob_next(pos))