Skip to content

Fix #1009, reject empty array reference token in decode_array_index_from_pointer #1032

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

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

Fix #1009, reject empty array reference token in decode_array_index_from_pointer #1032

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
6 changes: 6 additions & 0 deletions cJSON_Utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,12 @@ static cJSON_bool decode_array_index_from_pointer(const unsigned char * const po
size_t parsed_index = 0;
size_t position = 0;

if ((pointer[0] == '\0') || (pointer[0] == '/'))
{
/* an empty reference token is not a valid array index */
return 0;
}

if ((pointer[0] == '0') && ((pointer[1] != '\0') && (pointer[1] != '/')))
{
/* leading zeroes are not permitted */
Expand Down
14 changes: 13 additions & 1 deletion tests/json-patch-tests/cjson-utils-tests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,17 @@
"doc": {"foo": {"bar": 1}},
"patch": [{"op": "add", "path": "/foo/bar/baz", "value": "5"}],
"error": "attempting to add to subfield of non-object"
}
},
{
"comment": "16, an empty reference token is not a valid array index",
"doc": [ "first", "second", "third" ],
"patch": [{ "op": "remove", "path": "/" }],
"error": "an empty reference token is not a valid array index"
},
{
"comment": "17, an empty reference token is not a valid array index",
"doc": [ "first", "second", "third" ],
"patch": [{ "op": "replace", "path": "/", "value": "x" }],
"error": "an empty reference token is not a valid array index"
}
]
23 changes: 23 additions & 0 deletions tests/old_utils_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,28 @@ static void json_pointer_tests(void)
cJSON_Delete(root);
}

static void json_pointer_should_reject_empty_array_index(void)
{
/* An empty reference token is not a valid array index (RFC 6901), so it
* must not be silently accepted as index 0. */
cJSON *array = cJSON_Parse("[\"first\", \"second\", \"third\"]");
cJSON *nested = cJSON_Parse("[[1, 2], [3, 4]]");

TEST_ASSERT_NOT_NULL(array);
TEST_ASSERT_NOT_NULL(nested);

/* valid array indices still resolve */
TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(array, "/0"), cJSON_GetArrayItem(array, 0));
TEST_ASSERT_EQUAL_PTR(cJSONUtils_GetPointer(nested, "/0/1"), cJSON_GetArrayItem(cJSON_GetArrayItem(nested, 0), 1));

/* an empty array reference token must be rejected, not resolved to index 0 */
TEST_ASSERT_NULL(cJSONUtils_GetPointer(array, "/"));
TEST_ASSERT_NULL(cJSONUtils_GetPointer(nested, "/0/"));

cJSON_Delete(array);
cJSON_Delete(nested);
}

static void misc_tests(void)
{
/* Misc tests */
Expand Down Expand Up @@ -216,6 +238,7 @@ int main(void)
UNITY_BEGIN();

RUN_TEST(json_pointer_tests);
RUN_TEST(json_pointer_should_reject_empty_array_index);
RUN_TEST(misc_tests);
RUN_TEST(sort_tests);
RUN_TEST(merge_tests);
Expand Down