Indefinite maps decoding

Author: PJK

src/cbor.c

@@ -99,6 +99,7 @@ cbor_item_t * cbor_load(cbor_data source,
 		.indef_array_start = &cbor_builder_indef_array_start_callback,
 
 		.map_start = &cbor_builder_map_start_callback,
+		.indef_map_start = &cbor_builder_indef_map_start_callback,
 
 		.tag = &cbor_builder_tag_callback,
 

src/cbor_internal.c

@@ -108,23 +108,22 @@ void _cbor_builder_append(cbor_item_t * item, struct _cbor_decoder_context * ctx
 			}
 		case CBOR_TYPE_MAP:
 			{
+				/* We use 0 and 1 subitems to distinguish between keys and values in indefinite items */
+				if (ctx->stack->top->subitems % 2) {
+					cbor_map_handle(ctx->stack->top->item)[cbor_map_size(ctx->stack->top->item) - 1].value = item;
+				} else {
+					/* Even record, this is a key */
+					cbor_map_add(ctx->stack->top->item, (struct cbor_pair) {.key = item, .value = NULL});
+				}
 				if (cbor_map_is_definite(ctx->stack->top->item)) {
-					assert(ctx->stack->top->subitems > 0);
-					if (ctx->stack->top->subitems % 2) {
-						// TODO this is fugly
-						cbor_map_handle(ctx->stack->top->item)[cbor_map_size(ctx->stack->top->item) - 1].value = item;
-					} else {
-						/* Even record, this is a key */
-						cbor_map_add(ctx->stack->top->item, (struct cbor_pair) {.key = item, .value = NULL});
-					}
 					ctx->stack->top->subitems--;
 					if (ctx->stack->top->subitems == 0) {
 						cbor_item_t *item = ctx->stack->top->item;
 						_cbor_stack_pop(ctx->stack);
 						_cbor_builder_append(item, ctx);
 					}
 				} else {
-					// TODO uh oh
+					ctx->stack->top->subitems ^= 1; /* Flip the indicator for indefinite items */
 				}
 				break;
 			}

test/type_5_test.c

@@ -32,6 +32,7 @@ static void test_simple_map(void **state)
 	assert_non_null(map);
 	assert_true(cbor_typeof(map) == CBOR_TYPE_MAP);
 	assert_true(cbor_isa_map(map));
+	assert_true(cbor_map_is_definite(map));
 	assert_true(cbor_map_size(map) == 2);
 	assert_true(res.read == 5);
 	struct cbor_pair * handle = cbor_map_handle(map);
@@ -43,12 +44,30 @@ static void test_simple_map(void **state)
 	assert_null(map);
 }
 
-
+unsigned char simple_indef_map[] = { 0xBF, 0x01, 0x02, 0x03, 0x04, 0xFF }; /* {_ 1: 2, 3: 4} */
+static void test_indef_simple_map(void **state)
+{
+	map = cbor_load(simple_indef_map, 6, CBOR_FLAGS_NONE, &res);
+	assert_non_null(map);
+	assert_true(cbor_typeof(map) == CBOR_TYPE_MAP);
+	assert_true(cbor_isa_map(map));
+	assert_true(cbor_map_is_indefinite(map));
+	assert_true(cbor_map_size(map) == 2);
+	assert_true(res.read == 6);
+	struct cbor_pair * handle = cbor_map_handle(map);
+	assert_uint8(handle[0].key, 1);
+	assert_uint8(handle[0].value, 2);
+	assert_uint8(handle[1].key, 3);
+	assert_uint8(handle[1].value, 4);
+	cbor_decref(&map);
+	assert_null(map);
+}
 
 int main(void) {
 	const UnitTest tests[] = {
 		unit_test(test_empty_map),
-		unit_test(test_simple_map)
+		unit_test(test_simple_map),
+		unit_test(test_indef_simple_map)
 	};
 	return run_tests(tests);
 }