blob/blobmsg: add null pointer checks to the *_for_each_attr functions, fix formatting

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

diff --git a/blob.h b/blob.h
index 44266e8dcb0b96193d75e7da67074ee17fe68408..88ee01cc21b40312f82ad5238d1d4fd8a10be751 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -231,16 +231,17 @@ blob_put_u64(struct blob_buf *buf, int id, uint64_t val)
 
 #define __blob_for_each_attr(pos, attr, rem) \
        for (pos = (void *) attr; \
-                rem > 0 && (blob_pad_len(pos) <= rem) && \
-                (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
-                rem -= blob_pad_len(pos), pos = blob_next(pos))
+            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); \
-                rem > 0 && (blob_pad_len(pos) <= rem) && \
-                (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
-                rem -= blob_pad_len(pos), pos = blob_next(pos))
+       for (rem = attr ? blob_len(attr) : 0, \
+            pos = attr ? blob_data(attr) : 0; \
+            rem > 0 && (blob_pad_len(pos) <= rem) && \
+            (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
+            rem -= blob_pad_len(pos), pos = blob_next(pos))
 
 
 #endif

diff --git a/blobmsg.h b/blobmsg.h
index 3eeec9b035ea63aca99b2a7f9e609d7b9d6df958..1e497f77041784882b00ce40e2aade7c232f3c3d 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -204,9 +204,10 @@ void blobmsg_printf(struct blob_buf *buf, const char *name, const char *format,
 /* blobmsg to json formatting */
 
 #define blobmsg_for_each_attr(pos, attr, rem) \
-       for (rem = blobmsg_data_len(attr), pos = blobmsg_data(attr); \
-                rem > 0 && (blob_pad_len(pos) <= rem) && \
-                (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
-                rem -= blob_pad_len(pos), pos = blob_next(pos))
+       for (rem = attr ? blobmsg_data_len(attr) : 0, \
+            pos = attr ? blobmsg_data(attr) : 0; \
+            rem > 0 && (blob_pad_len(pos) <= rem) && \
+            (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
+            rem -= blob_pad_len(pos), pos = blob_next(pos))
 
 #endif