Skip to content

Potential Vulnerability in Cloned Code #71

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

Draft
pr-hung wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Potential Vulnerability in Cloned Code #71

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
30 changes: 29 additions & 1 deletion src/utils/cJSON.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,28 @@ typedef struct internal_hooks
#if defined(_MSC_VER)
/* work around MSVC error C2322: '...' address of dillimport '...' is not static */
static void *internal_malloc(size_t size)
static void cjson_get_object_item_should_not_crash_with_array(void) {
cJSON *array = NULL;
cJSON *found = NULL;
array = cJSON_Parse("[1]");

found = cJSON_GetObjectItem(array, "name");
TEST_ASSERT_NULL(found);

cJSON_Delete(array);
}

static void cjson_get_object_item_case_sensitive_should_not_crash_with_array(void) {
cJSON *array = NULL;
cJSON *found = NULL;
array = cJSON_Parse("[1]");

found = cJSON_GetObjectItemCaseSensitive(array, "name");
TEST_ASSERT_NULL(found);

cJSON_Delete(array);
}

{
return malloc(size);
}
Expand Down Expand Up @@ -535,6 +557,8 @@ static cJSON_bool print_number(const cJSON * const item, printbuffer * const out

return true;
}
RUN_TEST(cjson_get_object_item_should_not_crash_with_array);
RUN_TEST(cjson_get_object_item_case_sensitive_should_not_crash_with_array);

/* parse 4 digit hexadecimal number */
static unsigned parse_hex4(const unsigned char * const input)
Expand Down Expand Up @@ -1781,7 +1805,7 @@ static cJSON *get_object_item(const cJSON * const object, const char * const nam
current_element = object->child;
if (case_sensitive)
{
while ((current_element != NULL) && (strcmp(name, current_element->string) != 0))
while ((current_element != NULL) && (current_element->string != NULL) && (strcmp(name, current_element->string) != 0))
{
current_element = current_element->next;
}
Expand All @@ -1794,6 +1818,10 @@ static cJSON *get_object_item(const cJSON * const object, const char * const nam
}
}

if ((current_element == NULL) || (current_element->string == NULL)) {
return NULL;
}

return current_element;
}

Expand Down