DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2013-07-29 14:44:11 +02:00
parent 510e4956e5
commit ef9b6b92df
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
blob.h
View file

@ -231,16 +231,17 @@ blob_put_u64(struct blob_buf *buf, int id, uint64_t val)
#define __blob_for_each_attr(pos, attr, rem) \ #define __blob_for_each_attr(pos, attr, rem) \
for (pos = (void *) attr; \ for (pos = (void *) attr; \
rem > 0 && (blob_pad_len(pos) <= rem) && \ rem > 0 && (blob_pad_len(pos) <= rem) && \
(blob_pad_len(pos) >= sizeof(struct blob_attr)); \ (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
rem -= blob_pad_len(pos), pos = blob_next(pos)) rem -= blob_pad_len(pos), pos = blob_next(pos))
#define blob_for_each_attr(pos, attr, rem) \ #define blob_for_each_attr(pos, attr, rem) \
for (rem = blob_len(attr), pos = blob_data(attr); \ for (rem = attr ? blob_len(attr) : 0, \
rem > 0 && (blob_pad_len(pos) <= rem) && \ pos = attr ? blob_data(attr) : 0; \
(blob_pad_len(pos) >= sizeof(struct blob_attr)); \ rem > 0 && (blob_pad_len(pos) <= rem) && \
rem -= blob_pad_len(pos), pos = blob_next(pos)) (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
rem -= blob_pad_len(pos), pos = blob_next(pos))
#endif #endif

9
blobmsg.h
View file

@ -204,9 +204,10 @@ void blobmsg_printf(struct blob_buf *buf, const char *name, const char *format,
/* blobmsg to json formatting */ /* blobmsg to json formatting */
#define blobmsg_for_each_attr(pos, attr, rem) \ #define blobmsg_for_each_attr(pos, attr, rem) \
for (rem = blobmsg_data_len(attr), pos = blobmsg_data(attr); \ for (rem = attr ? blobmsg_data_len(attr) : 0, \
rem > 0 && (blob_pad_len(pos) <= rem) && \ pos = attr ? blobmsg_data(attr) : 0; \
(blob_pad_len(pos) >= sizeof(struct blob_attr)); \ rem > 0 && (blob_pad_len(pos) <= rem) && \
rem -= blob_pad_len(pos), pos = blob_next(pos)) (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
rem -= blob_pad_len(pos), pos = blob_next(pos))
#endif #endif