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

diff --git a/blob.c b/blob.c
index 89ed31a..edf55d4 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,6 +139,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 +178,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)
@@ -175,3 +201,18 @@ blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_at
 	}
 	return found;
 }
+
+bool
+blob_attr_equal(const struct blob_attr *a1, const struct blob_attr *a2)
+{
+	if (!a1 && !a2)
+		return true;
+
+	if (!a1 || !a2)
+		return false;
+
+	if (blob_pad_len(a1) != blob_pad_len(a2))
+		return false;
+
+	return !memcmp(a1, a2, blob_pad_len(a1));
+}