helper: fix out of bound access on unmarshal

libmcu · Aug 7, 2023 · e89320c · e89320c
1 parent 30bbd24
commit e89320c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/include/cbor/helper.h b/include/cbor/helper.h
@@ -16,6 +16,7 @@ extern "C" {
 
 struct cbor_parser {
 	const void *key;
+	size_t keylen;
 	void (*run)(const cbor_reader_t *reader,
 			const struct cbor_parser *parser,
 			const cbor_item_t *item, void *arg);

diff --git a/src/helper.c b/src/helper.c
@@ -26,7 +26,7 @@ static const struct cbor_parser *get_parser(const struct parser_ctx *ctx,
 			continue;
 		}
 
-		if (strkey && strkey_len) {
+		if (strkey && strkey_len && p->keylen >= strkey_len) {
 			if (memcmp(p->key, strkey, strkey_len) == 0) {
 				return p;
 			}