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

blobmsg: constify and add more validation

Browse source
This commit is contained in:
Felix Fietkau 2011-01-31 03:51:06 +01:00
parent cad5bea36d
commit 7a0571a9ff
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
blobmsg.c
View file

@ -21,7 +21,7 @@ struct strbuf {
char *buf; char *buf;
}; };
static bool blobmsg_puts(struct strbuf *s, char *c, int len) static bool blobmsg_puts(struct strbuf *s, const char *c, int len)
{ {
if (len <= 0) if (len <= 0)
return true; return true;
@ -37,9 +37,9 @@ static bool blobmsg_puts(struct strbuf *s, char *c, int len)
return true; return true;
} }
static void blobmsg_format_string(struct strbuf *s, char *str) static void blobmsg_format_string(struct strbuf *s, const char *str)
{ {
char *p, *last = str, *end = str + strlen(str); const char *p, *last = str, *end = str + strlen(str);
char buf[8] = "\\u00"; char buf[8] = "\\u00";
blobmsg_puts(s, "\"", 1); blobmsg_puts(s, "\"", 1);
@ -175,9 +175,19 @@ char *blobmsg_format_json(struct blob_attr *attr, bool list)
return s.buf; return s.buf;
} }
static const int blob_type[__BLOBMSG_TYPE_LAST] = {
[BLOBMSG_TYPE_INT8] = BLOB_ATTR_INT8,
[BLOBMSG_TYPE_INT16] = BLOB_ATTR_INT16,
[BLOBMSG_TYPE_INT32] = BLOB_ATTR_INT32,
[BLOBMSG_TYPE_INT64] = BLOB_ATTR_INT64,
[BLOBMSG_TYPE_STRING] = BLOB_ATTR_STRING,
};
bool blobmsg_check_attr(const struct blob_attr *attr, bool name) bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
{ {
const struct blobmsg_hdr *hdr; const struct blobmsg_hdr *hdr;
const char *data;
int id, len;
if (blob_len(attr) < sizeof(struct blobmsg_hdr)) if (blob_len(attr) < sizeof(struct blobmsg_hdr))
return false; return false;
@ -192,7 +202,17 @@ bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
if (hdr->name[hdr->namelen] != 0) if (hdr->name[hdr->namelen] != 0)
return false; return false;
return true; id = blob_id(attr);
len = blobmsg_data_len(attr);
data = blobmsg_data(attr);
if (!id || id > BLOBMSG_TYPE_LAST)
return false;
if (!blob_type[id])
return true;
return blob_check_type(data, len, blob_type[id]);
} }
int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len, int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,

8
blobmsg.h
View file

@ -49,19 +49,19 @@ static inline int blobmsg_hdrlen(int namelen)
return BLOBMSG_PADDING(sizeof(struct blobmsg_hdr) + namelen + 1); return BLOBMSG_PADDING(sizeof(struct blobmsg_hdr) + namelen + 1);
} }
static inline char *blobmsg_name(struct blob_attr *attr) static inline const char *blobmsg_name(const struct blob_attr *attr)
{ {
struct blobmsg_hdr *hdr = blob_data(attr); struct blobmsg_hdr *hdr = blob_data(attr);
return (char *) hdr->name; return (const char *) hdr->name;
} }
static inline void *blobmsg_data(struct blob_attr *attr) static inline void *blobmsg_data(const struct blob_attr *attr)
{ {
struct blobmsg_hdr *hdr = blob_data(attr); struct blobmsg_hdr *hdr = blob_data(attr);
return (char *) hdr + blobmsg_hdrlen(hdr->namelen); return (char *) hdr + blobmsg_hdrlen(hdr->namelen);
} }
static inline int blobmsg_data_len(struct blob_attr *attr) static inline int blobmsg_data_len(const struct blob_attr *attr)
{ {
uint8_t *start, *end; uint8_t *start, *end;