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

tests for cJSON_Duplicate, so it will fail by returning 0 if anything fails to allocate

Browse Source 
git-svn-id: http://svn.code.sf.net/p/cjson/code@49 e3330c51-1366-4df0-8b21-3ccf24e3d50e
This commit is contained in:
Dave Gamble 2013-02-05 18:26:51 +00:00
parent 927aa631b8
commit d755436ba7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cJSON.c
View File

@ -541,8 +541,8 @@ cJSON *cJSON_Duplicate(cJSON *item,int recurse)
if (!newitem) return 0; if (!newitem) return 0;
/* Copy over all vars */ /* Copy over all vars */
newitem->type=item->type&(~cJSON_IsReference),newitem->valueint=item->valueint,newitem->valuedouble=item->valuedouble; newitem->type=item->type&(~cJSON_IsReference),newitem->valueint=item->valueint,newitem->valuedouble=item->valuedouble;
if (item->valuestring) newitem->valuestring=cJSON_strdup(item->valuestring); if (item->valuestring) {newitem->valuestring=cJSON_strdup(item->valuestring); if (!newitem->valuestring) {cJSON_Delete(newitem);return 0;}}
if (item->string) newitem->string=cJSON_strdup(item->string); if (item->string) {newitem->string=cJSON_strdup(item->string); if (!newitem->string) {cJSON_Delete(newitem);return 0;}}
/* If non-recursive, then we're done! */ /* If non-recursive, then we're done! */
if (!recurse) return newitem; if (!recurse) return newitem;
/* Walk the ->next chain for the child. */ /* Walk the ->next chain for the child. */
@ -550,6 +550,7 @@ cJSON *cJSON_Duplicate(cJSON *item,int recurse)
while (cptr) while (cptr)
{ {
newchild=cJSON_Duplicate(cptr,1); /* Duplicate (with recurse) each item in the ->next chain */ newchild=cJSON_Duplicate(cptr,1); /* Duplicate (with recurse) each item in the ->next chain */
if (!newchild) {cJSON_Delete(newitem);return 0;}
if (nptr) {nptr->next=newchild,newchild->prev=nptr;nptr=newchild;} /* If newitem->child already set, then crosswire ->prev and ->next and move on */ if (nptr) {nptr->next=newchild,newchild->prev=nptr;nptr=newchild;} /* If newitem->child already set, then crosswire ->prev and ->next and move on */
else {newitem->child=newchild;nptr=newchild;} /* Set newitem->child and move to it */ else {newitem->child=newchild;nptr=newchild;} /* Set newitem->child and move to it */
cptr=cptr->next; cptr=cptr->next;