Array handling fixes

PJK · Apr 26, 2015 · 0d7a973 · 0d7a973
1 parent c4a8a1e
commit 0d7a973
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/cbor.c b/src/cbor.c
@@ -1218,7 +1218,7 @@ cbor_item_t *cbor_new_definite_array(size_t size)
 	*item = (cbor_item_t) {
 		.refcount = 1,
 		.type = CBOR_TYPE_ARRAY,
-		.metadata = {.array_metadata = {.type = _CBOR_METADATA_DEFINITE, .size = size}},
+		.metadata = {.array_metadata = {.type = _CBOR_METADATA_DEFINITE, .size = size, .ptr = 0}},
 		.data = _CBOR_MALLOC(sizeof(cbor_item_t *) * size)
 	};
 	return item;
@@ -1230,7 +1230,7 @@ cbor_item_t *cbor_new_indefinite_array()
 	*item = (cbor_item_t) {
 		.refcount = 1,
 		.type = CBOR_TYPE_ARRAY,
-		.metadata = {.array_metadata = {.type = _CBOR_METADATA_INDEFINITE, .size = 0}},
+		.metadata = {.array_metadata = {.type = _CBOR_METADATA_INDEFINITE, .size = 0, .ptr = 0}},
 		.data = NULL /* Can be safely realloc-ed */
 	};
 	return item;
@@ -1244,7 +1244,7 @@ cbor_item_t *cbor_array_push(cbor_item_t *array, cbor_item_t *pushee)
 	cbor_item_t **data = (cbor_item_t **) array->data;
 	if (cbor_array_is_definite(array)) {
 		// TODO check size - throw
-		data[metadata->size++] = pushee;
+		data[metadata->ptr++] = pushee;
 	} else {
 		// TODO exponential reallocs?
 		data = _CBOR_REALLOC(data, (metadata->size + 1) * sizeof(cbor_item_t *));

diff --git a/src/cbor.h b/src/cbor.h
@@ -77,6 +77,7 @@ struct _cbor_string_metadata {
 
 struct _cbor_array_metadata {
 	size_t             size;
+	size_t             ptr;
 	_cbor_dst_metadata type;
 };
 

diff --git a/test/type_4_test.c b/test/type_4_test.c
@@ -33,7 +33,7 @@ static void test_simple_array(void **state)
 	assert_non_null(arr);
 	assert_true(cbor_typeof(arr) == CBOR_TYPE_ARRAY);
 	assert_true(cbor_isa_array(arr));
-	assert_true(cbor_array_size(arr) == 1);
+	assert_int_equal(cbor_array_size(arr), 1);
 	assert_true(res.read == 2);
 	/* Check the values */
 	assert_uint8(cbor_array_handle(arr)[0], 1);