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

Merge pull request #20 from FSMaxB/fix_memory_leaks

Browse Source 
fix memory leaks
This commit is contained in:
Kevin Branigan 2015-10-18 17:03:25 -04:00
commit 99c46e7661
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cJSON_Utils.c
View File

@ -186,7 +186,7 @@ static int cJSONUtils_ApplyPatch(cJSON *object,cJSON *patch)
cJSONUtils_InplaceDecodePointerString(childptr); cJSONUtils_InplaceDecodePointerString(childptr);
/* add, remove, replace, move, copy, test. */ /* add, remove, replace, move, copy, test. */
if (!parent) {free(parentptr); return 9;} /* Couldn't find object to add to. */ if (!parent) {free(parentptr); cJSON_Delete(value); return 9;} /* Couldn't find object to add to. */
else if (parent->type==cJSON_Array) else if (parent->type==cJSON_Array)
{ {
if (!strcmp(childptr,"-")) cJSON_AddItemToArray(parent,value); if (!strcmp(childptr,"-")) cJSON_AddItemToArray(parent,value);
@ -197,6 +197,10 @@ static int cJSONUtils_ApplyPatch(cJSON *object,cJSON *patch)
cJSON_DeleteItemFromObject(parent,childptr); cJSON_DeleteItemFromObject(parent,childptr);
cJSON_AddItemToObject(parent,childptr,value); cJSON_AddItemToObject(parent,childptr,value);
} }
else
{
cJSON_Delete(value);
}
free(parentptr); free(parentptr);
return 0; return 0;
} }

13
test_utils.c
View File

@ -91,9 +91,16 @@ int main()
nums=cJSON_CreateIntArray(numbers,10); nums=cJSON_CreateIntArray(numbers,10);
num6=cJSON_GetArrayItem(nums,6); num6=cJSON_GetArrayItem(nums,6);
cJSON_AddItemToObject(object,"numbers",nums); cJSON_AddItemToObject(object,"numbers",nums);
printf("Pointer: [%s]\n",cJSONUtils_FindPointerFromObjectTo(object,num6)); char *temp=cJSONUtils_FindPointerFromObjectTo(object,num6);
printf("Pointer: [%s]\n",cJSONUtils_FindPointerFromObjectTo(object,nums)); printf("Pointer: [%s]\n",temp);
printf("Pointer: [%s]\n",cJSONUtils_FindPointerFromObjectTo(object,object)); free(temp);
temp=cJSONUtils_FindPointerFromObjectTo(object,nums);
printf("Pointer: [%s]\n",temp);
free(temp);
temp=cJSONUtils_FindPointerFromObjectTo(object,object);
printf("Pointer: [%s]\n",temp);
free(temp);
cJSON_Delete(object);
/* JSON Sort test: */ /* JSON Sort test: */
sortme=cJSON_CreateObject(); sortme=cJSON_CreateObject();