diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-07-29 16:44:11 +0400 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-29 16:44:11 +0400 |
commit | ef9b6b92df223e783a365f34998bc0f299b977f2 (patch) | |
tree | 26f4e0b01c905b09cc5f9e58867f0bd2bd10fbe3 /blobmsg.h | |
parent | 510e4956e58727d68fbf7dea1646a344d6901c91 (diff) |
blob/blobmsg: add null pointer checks to the *_for_each_attr functions, fix formatting
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'blobmsg.h')
-rw-r--r-- | blobmsg.h | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -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 |