X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.c;h=cc6b2f3cb93daebd3e954af7ee28386718923eba;hp=25b72ae6d9bcda4fd48cdc927d349a866753b052;hb=71f0be5e11b773ed4b09d1cc46099cdafacbd56a;hpb=e82d74f89809c6c01f71168b3b8fdcf490e93fa7

diff --git a/blobmsg.c b/blobmsg.c
index 25b72ae..cc6b2f3 100644
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -15,6 +15,26 @@
 
 #include "blobmsg.h"
 
+bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
+{
+	const struct blobmsg_hdr *hdr;
+
+	if (blob_len(attr) < sizeof(struct blobmsg_hdr))
+		return false;
+
+	hdr = (void *) attr->data;
+	if (!hdr->namelen && name)
+		return false;
+
+	if (hdr->namelen > blob_len(attr))
+		return false;
+
+	if (hdr->name[hdr->namelen] != 0)
+		return false;
+
+	return true;
+}
+
 int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
                   struct blob_attr **tb, void *data, int len)
 {
@@ -45,13 +65,7 @@ int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
 			if (hdr->namelen != pslen[i])
 				continue;
 
-			if (!hdr->namelen)
-				return -1;
-
-			if (sizeof(*attr) + blobmsg_hdrlen(hdr->namelen) > blob_pad_len(attr))
-				return -1;
-
-			if (hdr->name[hdr->namelen] != 0)
+			if (!blobmsg_check_attr(attr, true))
 				return -1;
 
 			if (tb[i])