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

fix segfault when passed blobmsg attr is NULL

Browse source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2018-07-25 10:30:05 +02:00
parent 3c1b33b7d5
commit c83a84afbe
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
blobmsg.c
View file

@ -135,6 +135,8 @@ int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
int i; int i;
memset(tb, 0, policy_len * sizeof(*tb)); memset(tb, 0, policy_len * sizeof(*tb));
if (!data || !len)
return -EINVAL;
pslen = alloca(policy_len); pslen = alloca(policy_len);
for (i = 0; i < policy_len; i++) { for (i = 0; i < policy_len; i++) {
if (!policy[i].name) if (!policy[i].name)

13
blobmsg.h
View file

@ -71,8 +71,14 @@ static inline int blobmsg_type(const struct blob_attr *attr)
static inline void *blobmsg_data(const struct blob_attr *attr) static inline void *blobmsg_data(const struct blob_attr *attr)
{ {
struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr); struct blobmsg_hdr *hdr;
char *data = (char *) blob_data(attr); char *data;
if (!attr)
return NULL;
hdr = (struct blobmsg_hdr *) blob_data(attr);
data = (char *) blob_data(attr);
if (blob_is_extended(attr)) if (blob_is_extended(attr))
data += blobmsg_hdrlen(be16_to_cpu(hdr->namelen)); data += blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
@ -84,6 +90,9 @@ static inline int blobmsg_data_len(const struct blob_attr *attr)
{ {
uint8_t *start, *end; uint8_t *start, *end;
if (!attr)
return 0;
start = (uint8_t *) blob_data(attr); start = (uint8_t *) blob_data(attr);
end = (uint8_t *) blobmsg_data(attr); end = (uint8_t *) blobmsg_data(attr);