Test misplaced breaks

PJK · Dec 28, 2022 · f0c203b · f0c203b
1 parent 3baf4c2
commit f0c203b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/cbor/internal/builder_callbacks.c b/src/cbor/internal/builder_callbacks.c
@@ -347,14 +347,13 @@ void cbor_builder_map_start_callback(void *context, uint64_t size) {
 bool _cbor_is_indefinite(cbor_item_t *item) {
   switch (item->type) {
     case CBOR_TYPE_BYTESTRING:
-      return item->metadata.bytestring_metadata.type ==
-             _CBOR_METADATA_INDEFINITE;
+      return cbor_bytestring_is_indefinite(item);
     case CBOR_TYPE_STRING:
-      return item->metadata.string_metadata.type == _CBOR_METADATA_INDEFINITE;
+      return cbor_string_is_indefinite(item);
     case CBOR_TYPE_ARRAY:
-      return item->metadata.array_metadata.type == _CBOR_METADATA_INDEFINITE;
+      return cbor_array_is_indefinite(item);
     case CBOR_TYPE_MAP:
-      return item->metadata.map_metadata.type == _CBOR_METADATA_INDEFINITE;
+      return cbor_map_is_indefinite(item);
     default:
       return false;
   }

diff --git a/test/callbacks_test.c b/test/callbacks_test.c
@@ -365,6 +365,17 @@ static void test_append_map_failure(void** _CBOR_UNUSED(_state)) {
   _cbor_stack_pop(&stack);
 }
 
+// Size 1 array start, but we get an indef break
+unsigned char invalid_indef_break_data[] = {0x81, 0xFF};
+static void test_invalid_indef_break(void** _CBOR_UNUSED(_state)) {
+  struct cbor_load_result res;
+  cbor_item_t* item = cbor_load(invalid_indef_break_data, 2, &res);
+
+  assert_null(item);
+  assert_int_equal(res.read, 2);
+  assert_true(res.error.code == CBOR_ERR_SYNTAXERROR);
+}
+
 int main(void) {
   const struct CMUnitTest tests[] = {
       cmocka_unit_test(test_default_callbacks),
@@ -381,6 +392,7 @@ int main(void) {
           test_builder_string_callback_append_parent_alloc_failure),
       cmocka_unit_test(test_append_array_failure),
       cmocka_unit_test(test_append_map_failure),
+      cmocka_unit_test(test_invalid_indef_break),
   };
 
   cmocka_run_group_tests(tests, NULL, NULL);