explicitly zero extra buffer space added with realloc to silence valgrind warnings

[project/libubox.git] / blob.h

diff --git a/blob.h b/blob.h
index 201f508..7f4a46a 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -213,7 +213,9 @@ blob_next(const struct blob_attr *attr)
        return (struct blob_attr *) ((char *) attr + blob_pad_len(attr));
 }
 
+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);
 extern void *blob_nest_start(struct blob_buf *buf, int id);
 extern void blob_nest_end(struct blob_buf *buf, void *cookie);
@@ -256,14 +258,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))