mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

fix null pointer dereferences found by coverity

Browse Source
This commit is contained in:
Max Bruckner 2017-02-07 19:07:18 +01:00
parent 2f712c7456
commit 9ed906758e
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cJSON.c
View File

@ -1789,14 +1789,18 @@ static cJSON *create_reference(const cJSON *item)
} }
/* Add item to array/object. */ /* Add item to array/object. */
void cJSON_AddItemToArray(cJSON *array, cJSON *item) void cJSON_AddItemToArray(cJSON *array, cJSON *item)
{ {
cJSON *c = array->child; cJSON *child = NULL;
if (!item)
if ((item == NULL) || (array == NULL))
{ {
return; return;
} }
if (!c)
child = array->child;
if (child == NULL)
{ {
/* list is empty, start new one */ /* list is empty, start new one */
array->child = item; array->child = item;
@ -1804,11 +1808,11 @@ void cJSON_AddItemToArray(cJSON *array, cJSON *item)
else else
{ {
/* append to the end */ /* append to the end */
while (c->next) while (child->next)
{ {
c = c->next; child = child->next;
} }
suffix_object(c, item); suffix_object(child, item);
} }
} }

11
cJSON_Utils.c
View File

@ -494,6 +494,12 @@ static int cJSONUtils_ApplyPatch(cJSON *object, cJSON *patch)
int cJSONUtils_ApplyPatches(cJSON *object, cJSON *patches) int cJSONUtils_ApplyPatches(cJSON *object, cJSON *patches)
{ {
int err = 0; int err = 0;
if (patches == NULL)
{
return 1;
}
if ((patches->type & 0xFF) != cJSON_Array) if ((patches->type & 0xFF) != cJSON_Array)
{ {
/* malformed patches. */ /* malformed patches. */
@ -544,6 +550,11 @@ void cJSONUtils_AddPatchToArray(cJSON *array, const char *op, const char *path,
static void cJSONUtils_CompareToPatch(cJSON *patches, const unsigned char *path, cJSON *from, cJSON *to) static void cJSONUtils_CompareToPatch(cJSON *patches, const unsigned char *path, cJSON *from, cJSON *to)
{ {
if ((from == NULL) || (to == NULL))
{
return;
}
if ((from->type & 0xFF) != (to->type & 0xFF)) if ((from->type & 0xFF) != (to->type & 0xFF))
{ {
cJSONUtils_GeneratePatch(patches, (const unsigned char*)"replace", path, 0, to); cJSONUtils_GeneratePatch(patches, (const unsigned char*)"replace", path, 0, to);