Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

decoder/nanocbor_leave_container(): reject (some) invalid arguments #92

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −7
Open

decoder/nanocbor_leave_container(): reject (some) invalid arguments #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion include/nanocbor/nanocbor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,11 @@ int nanocbor_enter_map(const nanocbor_value_t *it, nanocbor_value_t *map);
*
* @param[in] it parent CBOR structure
* @param[in] container exhausted CBOR container
*
* @return NANOCBOR_OK on success
* @return negative on error
*/
void nanocbor_leave_container(nanocbor_value_t *it,
int nanocbor_leave_container(nanocbor_value_t *it,
nanocbor_value_t *container);

/**
Expand Down
10 changes: 9 additions & 1 deletion src/decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,8 +513,15 @@ int nanocbor_enter_map(const nanocbor_value_t *it, nanocbor_value_t *map)
return res;
}

void nanocbor_leave_container(nanocbor_value_t *it, nanocbor_value_t *container)
int nanocbor_leave_container(nanocbor_value_t *it, nanocbor_value_t *container)
{
/* check `container` to be a valid, fully consumed container that is plausible to have been entered from `it` */
if (!nanocbor_in_container(container) ||
!nanocbor_at_end(container) ||
container->cur <= it->cur ||
container->cur > it->end) {
return NANOCBOR_ERR_INVALID_TYPE;
}
if (it->remaining) {
it->remaining--;
}
Expand All @@ -524,6 +531,7 @@ void nanocbor_leave_container(nanocbor_value_t *it, nanocbor_value_t *container)
else {
it->cur = container->cur;
}
return NANOCBOR_OK;
}

static int _skip_simple(nanocbor_value_t *it)
Expand Down
10 changes: 5 additions & 5 deletions tests/automated/test_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static void test_decode_map(void)
nanocbor_decoder_init(&val, map_empty, sizeof(map_empty));
CU_ASSERT_EQUAL(nanocbor_enter_map(&val, &cont), NANOCBOR_OK);
CU_ASSERT_EQUAL(nanocbor_at_end(&cont), true);
nanocbor_leave_container(&val, &cont);
CU_ASSERT_EQUAL(nanocbor_leave_container(&val, &cont), NANOCBOR_OK);
CU_ASSERT_EQUAL(nanocbor_at_end(&val), true);

/* Init the decoder and verify the decoding of the map elements */
Expand All @@ -63,7 +63,7 @@ static void test_decode_map(void)
CU_ASSERT(nanocbor_get_uint32(&cont, &tmp) > 0);
CU_ASSERT_EQUAL(tmp, 2);
CU_ASSERT_EQUAL(nanocbor_at_end(&cont), true);
nanocbor_leave_container(&val, &cont);
CU_ASSERT_EQUAL(nanocbor_leave_container(&val, &cont), NANOCBOR_OK);
CU_ASSERT_EQUAL(nanocbor_at_end(&val), true);

/* Init the decoder and skip over the empty map */
Expand All @@ -89,21 +89,21 @@ static void test_decode_map(void)
CU_ASSERT_EQUAL(tmp, 3);
CU_ASSERT_EQUAL(nanocbor_enter_array(&cont, &array), NANOCBOR_OK);
CU_ASSERT_EQUAL(nanocbor_at_end(&array), true);
nanocbor_leave_container(&cont, &array);
CU_ASSERT_EQUAL(nanocbor_leave_container(&cont, &array), NANOCBOR_OK);
CU_ASSERT_EQUAL(nanocbor_at_end(&cont), false);

CU_ASSERT(nanocbor_get_uint32(&cont, &tmp) > 0);
CU_ASSERT_EQUAL(tmp, 4);
CU_ASSERT_EQUAL(nanocbor_enter_array(&cont, &array), NANOCBOR_OK);
CU_ASSERT_EQUAL(nanocbor_at_end(&array), true);
nanocbor_leave_container(&cont, &array);
CU_ASSERT_EQUAL(nanocbor_leave_container(&cont, &array), NANOCBOR_OK);
CU_ASSERT_EQUAL(nanocbor_at_end(&cont), false);

CU_ASSERT(nanocbor_get_uint32(&cont, &tmp) > 0);
CU_ASSERT_EQUAL(tmp, 5);
CU_ASSERT_EQUAL(nanocbor_enter_array(&cont, &array), NANOCBOR_OK);
CU_ASSERT_EQUAL(nanocbor_at_end(&array), true);
nanocbor_leave_container(&cont, &array);
CU_ASSERT_EQUAL(nanocbor_leave_container(&cont, &array), NANOCBOR_OK);
CU_ASSERT_EQUAL(nanocbor_at_end(&cont), false);

CU_ASSERT(nanocbor_get_uint32(&cont, &tmp) > 0);
Expand Down