X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blob.c;h=3929ad325012c38038831f8da43b1c72efac060d;hp=823eb2446903d8f499fce8a5c653e55f976dda34;hb=f1a44355bd432964d13ab3a2bb2c5f5b0ef9dfcb;hpb=e82d74f89809c6c01f71168b3b8fdcf490e93fa7

diff --git a/blob.c b/blob.c
index 823eb24..3929ad3 100644
--- a/blob.c
+++ b/blob.c
@@ -80,6 +80,14 @@ blob_buf_init(struct blob_buf *buf, int id)
 	return 0;
 }
 
+void
+blob_buf_free(struct blob_buf *buf)
+{
+	free(buf->buf);
+	buf->buf = NULL;
+	buf->buflen = 0;
+}
+
 struct blob_attr *
 blob_new(struct blob_buf *buf, int id, int payload)
 {
@@ -131,8 +139,30 @@ 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, struct blob_attr_info *info, int max)
+blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_attr_info *info, int max)
 {
 	struct blob_attr *pos;
 	int found = 0;
@@ -148,14 +178,10 @@ blob_parse(struct blob_attr *attr, struct blob_attr **data, struct blob_attr_inf
 
 		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)