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_Utils: Fix size_t support of cJSONUtils_GetPointer

Browse Source
This commit is contained in:
Max Bruckner 2017-04-12 11:21:48 +02:00
parent 3056d85f01
commit c960b2b853
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cJSON_Utils.c
View File

@ -194,6 +194,19 @@ CJSON_PUBLIC(char *) cJSONUtils_FindPointerFromObjectTo(cJSON *object, cJSON *ta
return NULL; return NULL;
} }
/* non broken version of cJSON_GetArrayItem */
static cJSON *get_array_item(const cJSON *array, size_t item)
{
cJSON *child = array ? array->child : NULL;
while ((child != NULL) && (item > 0))
{
item--;
child = child->next;
}
return child;
}
CJSON_PUBLIC(cJSON *) cJSONUtils_GetPointer(cJSON *object, const char *pointer) CJSON_PUBLIC(cJSON *) cJSONUtils_GetPointer(cJSON *object, const char *pointer)
{ {
/* follow path of the pointer */ /* follow path of the pointer */
@ -201,22 +214,18 @@ CJSON_PUBLIC(cJSON *) cJSONUtils_GetPointer(cJSON *object, const char *pointer)
{ {
if (cJSON_IsArray(object)) if (cJSON_IsArray(object))
{ {
size_t which = 0; size_t index = 0;
/* parse array index */ /* parse array index */
while ((*pointer >= '0') && (*pointer <= '9')) while ((*pointer >= '0') && (*pointer <= '9'))
{ {
which = (10 * which) + (size_t)(*pointer++ - '0'); index = (10 * index) + (size_t)(*pointer++ - '0');
} }
if (*pointer && (*pointer != '/')) if (*pointer && (*pointer != '/'))
{ {
/* not end of string or new path token */ /* not end of string or new path token */
return NULL; return NULL;
} }
if (which > INT_MAX) object = get_array_item(object, index);
{
return NULL;
}
object = cJSON_GetArrayItem(object, (int)which);
} }
else if (cJSON_IsObject(object)) else if (cJSON_IsObject(object))
{ {