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

cJSON_ParseWithOpts: Use goto fail

Browse Source
This commit is contained in:
Max Bruckner 2017-03-21 20:25:10 +01:00
parent 11131b9ced
commit 06a2326e3b
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cJSON.c
View File

@ -904,19 +904,26 @@ CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return
const unsigned char *end = NULL; const unsigned char *end = NULL;
/* use global error pointer if no specific one was given */ /* use global error pointer if no specific one was given */
const unsigned char **error_pointer = (return_parse_end != NULL) ? (const unsigned char**)return_parse_end : &global_ep; const unsigned char **error_pointer = (return_parse_end != NULL) ? (const unsigned char**)return_parse_end : &global_ep;
cJSON *item = cJSON_New_Item(&global_hooks); cJSON *item = NULL;
*error_pointer = NULL; *error_pointer = NULL;
item = cJSON_New_Item(&global_hooks);
if (item == NULL) /* memory fail */ if (item == NULL) /* memory fail */
{ {
return NULL; goto fail;
}
if (value == NULL)
{
goto fail;
} }
end = parse_value(item, skip_whitespace((const unsigned char*)value), error_pointer, &global_hooks); end = parse_value(item, skip_whitespace((const unsigned char*)value), error_pointer, &global_hooks);
if (end == NULL) if (end == NULL)
{ {
/* parse failure. ep is set. */ /* parse failure. ep is set. */
cJSON_Delete(item); goto fail;
return NULL;
} }
/* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */ /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
@ -925,9 +932,8 @@ CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return
end = skip_whitespace(end); end = skip_whitespace(end);
if (*end != '\0') if (*end != '\0')
{ {
cJSON_Delete(item);
*error_pointer = end; *error_pointer = end;
return NULL; goto fail;
} }
} }
if (return_parse_end) if (return_parse_end)
@ -936,6 +942,14 @@ CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return
} }
return item; return item;
fail:
if (item != NULL)
{
cJSON_Delete(item);
}
return NULL;
} }
/* Default options for cJSON_Parse */ /* Default options for cJSON_Parse */