static inline const char *blobmsg_name(const struct blob_attr *attr)
{
- struct blobmsg_hdr *hdr = blob_data(attr);
+ struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
return (const char *) hdr->name;
}
static inline void *blobmsg_data(const struct blob_attr *attr)
{
- struct blobmsg_hdr *hdr = blob_data(attr);
- return (char *) hdr + blobmsg_hdrlen(hdr->namelen);
+ struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
+ return (char *) hdr + blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
}
static inline int blobmsg_data_len(const struct blob_attr *attr)
{
uint8_t *start, *end;
- start = blob_data(attr);
- end = blobmsg_data(attr);
+ start = (uint8_t *) blob_data(attr);
+ end = (uint8_t *) blobmsg_data(attr);
return blob_len(attr) - (end - start);
}
#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))