X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blob.c;h=003192ea6450d6733e79330eaf24fa574689b8f4;hp=89ed31ace089aa8fd1b0be15e289f420a556fe28;hb=c9e852301ba4059da47418fcaede22d6fa4603e9;hpb=d110a016e354d66cf86dddb53e3257ac9821896d

diff --git a/blob.c b/blob.c
index 89ed31a..003192e 100644
--- a/blob.c
+++ b/blob.c
@@ -131,6 +131,28 @@ static const int blob_type_minlen[BLOB_ATTR_LAST] = {
 	[BLOB_ATTR_INT64] = sizeof(uint64_t),
 };
 
+bool
+blob_check_type(const void *ptr, int len, int type)
+{
+	const char *data = ptr;
+
+	if (type >= BLOB_ATTR_LAST)
+		return false;
+
+	if (type >= BLOB_ATTR_INT8 && type <= BLOB_ATTR_INT64) {
+		if (len != blob_type_minlen[type])
+			return false;
+	} else {
+		if (len < blob_type_minlen[type])
+			return false;
+	}
+
+	if (type == BLOB_ATTR_STRING && data[len - 1] != 0)
+		return false;
+
+	return true;
+}
+
 int
 blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_attr_info *info, int max)
 {
@@ -148,14 +170,10 @@ blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_at
 
 		if (info) {
 			int type = info[id].type;
+
 			if (type < BLOB_ATTR_LAST) {
-				if (type >= BLOB_ATTR_INT8 && type <= BLOB_ATTR_INT64) {
-					if (len != blob_type_minlen[type])
-						continue;
-				} else {
-					if (len < blob_type_minlen[type])
-						continue;
-				}
+				if (!blob_check_type(blob_data(pos), len, type))
+					continue;
 			}
 
 			if (info[id].minlen && len < info[id].minlen)