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

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index 0b4565f..f2ab007 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -56,6 +56,11 @@ static inline const char *blobmsg_name(const struct blob_attr *attr)
        return (const char *) hdr->name;
 }
 
+static inline int blobmsg_type(const struct blob_attr *attr)
+{
+       return blob_id(attr);
+}
+
 static inline void *blobmsg_data(const struct blob_attr *attr)
 {
        struct blobmsg_hdr *hdr = blob_data(attr);
@@ -172,7 +177,7 @@ void blobmsg_add_string_buffer(struct blob_buf *buf);
 
 #define blobmsg_for_each_attr(pos, attr, rem) \
        for (rem = blobmsg_data_len(attr), pos = blobmsg_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))