From ef9b6b92df223e783a365f34998bc0f299b977f2 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 29 Jul 2013 14:44:11 +0200 Subject: blob/blobmsg: add null pointer checks to the *_for_each_attr functions, fix formatting Signed-off-by: Felix Fietkau --- blob.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'blob.h') diff --git a/blob.h b/blob.h index 44266e8..88ee01c 100644 --- 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 -- cgit v1.2.3