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

parse_object: Use parse_buffer

Browse Source
This commit is contained in:
Max Bruckner 2017-03-14 10:39:38 +01:00
parent 033a542532
commit fef1c45b92
3 changed files with 54 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
cJSON.c
View File

@ -900,7 +900,7 @@ static const unsigned char *parse_value(cJSON * const item, parse_buffer * const
static cJSON_bool print_value(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks); static cJSON_bool print_value(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks);
static const unsigned char *parse_array(cJSON * const item, parse_buffer * const input_buffer, const unsigned char ** const ep, const internal_hooks * const hooks); static const unsigned char *parse_array(cJSON * const item, parse_buffer * const input_buffer, const unsigned char ** const ep, const internal_hooks * const hooks);
static cJSON_bool print_array(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks); static cJSON_bool print_array(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks);
static const unsigned char *parse_object(cJSON * const item, const unsigned char *input, const unsigned char ** const ep, const internal_hooks * const hooks); static const unsigned char *parse_object(cJSON * const item, parse_buffer * const input_buffer, const unsigned char ** const ep, const internal_hooks * const hooks);
static cJSON_bool print_object(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks); static cJSON_bool print_object(const cJSON * const item, const size_t depth, const cJSON_bool format, printbuffer * const output_buffer, const internal_hooks * const hooks);
/* Utility to jump whitespace and cr/lf */ /* Utility to jump whitespace and cr/lf */
@ -1168,7 +1168,7 @@ static const unsigned char *parse_value(cJSON * const item, parse_buffer * cons
/* object */ /* object */
if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '{')) if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '{'))
{ {
content_pointer = parse_object(item, buffer_at_offset(input_buffer), error_pointer, hooks); content_pointer = parse_object(item, input_buffer, error_pointer, hooks);
if (content_pointer == NULL) if (content_pointer == NULL)
{ {
return NULL; return NULL;
@ -1423,26 +1423,35 @@ static cJSON_bool print_array(const cJSON * const item, const size_t depth, cons
} }
/* Build an object from the text. */ /* Build an object from the text. */
static const unsigned char *parse_object(cJSON * const item, const unsigned char *input, const unsigned char ** const error_pointer, const internal_hooks * const hooks) static const unsigned char *parse_object(cJSON * const item, parse_buffer * const input_buffer, const unsigned char ** const error_pointer, const internal_hooks * const hooks)
{ {
cJSON *head = NULL; /* linked list head */ cJSON *head = NULL; /* linked list head */
cJSON *current_item = NULL; cJSON *current_item = NULL;
parse_buffer input_buffer; const unsigned char *content_pointer = NULL;
if (*input != '{') if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '{'))
{ {
*error_pointer = input; *error_pointer = buffer_at_offset(input_buffer);
goto fail; /* not an object */ goto fail; /* not an object */
} }
input = skip_whitespace(input + 1); input_buffer->offset++;
if (*input == '}') buffer_skip_whitespace(input_buffer);
if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '}'))
{ {
goto success; /* empty object */ goto success; /* empty object */
} }
/* check if we skipped to the end of the buffer */
if (cannot_access_at_index(input_buffer, 0))
{
input_buffer->offset--;
*error_pointer = buffer_at_offset(input_buffer);
goto fail;
}
/* step back to character in front of the first element */ /* step back to character in front of the first element */
input--; input_buffer->offset--;
/* loop through the comma separated array elements */ /* loop through the comma separated array elements */
do do
{ {
@ -1468,41 +1477,40 @@ static const unsigned char *parse_object(cJSON * const item, const unsigned char
} }
/* parse the name of the child */ /* parse the name of the child */
input = skip_whitespace(input + 1); input_buffer->offset++;
input = parse_string(current_item, input, error_pointer, hooks); buffer_skip_whitespace(input_buffer);
input = skip_whitespace(input); content_pointer = parse_string(current_item, buffer_at_offset(input_buffer), error_pointer, hooks);
if (input == NULL) if (content_pointer == NULL)
{ {
goto fail; /* faile to parse name */ goto fail; /* faile to parse name */
} }
input_buffer->offset = (size_t)(content_pointer - input_buffer->content);
buffer_skip_whitespace(input_buffer);
/* swap valuestring and string, because we parsed the name */ /* swap valuestring and string, because we parsed the name */
current_item->string = current_item->valuestring; current_item->string = current_item->valuestring;
current_item->valuestring = NULL; current_item->valuestring = NULL;
if (*input != ':') if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != ':'))
{ {
*error_pointer = input; *error_pointer = buffer_at_offset(input_buffer);
goto fail; /* invalid object */ goto fail; /* invalid object */
} }
/* parse the value */ /* parse the value */
input = skip_whitespace(input + 1); input_buffer->offset++;
input_buffer.content = (const unsigned char*)input; buffer_skip_whitespace(input_buffer);
input_buffer.offset = 0; if (parse_value(current_item, input_buffer, error_pointer, hooks) == NULL)
input_buffer.length = strlen((const char*)input) + sizeof("");
input = parse_value(current_item, &input_buffer, error_pointer, hooks);
input = skip_whitespace(input);
if (input == NULL)
{ {
goto fail; /* failed to parse value */ goto fail; /* failed to parse value */
} }
buffer_skip_whitespace(input_buffer);
} }
while (*input == ','); while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
if (*input != '}') if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '}'))
{ {
*error_pointer = input; *error_pointer = buffer_at_offset(input_buffer);
goto fail; /* expected end of object */ goto fail; /* expected end of object */
} }
@ -1510,7 +1518,8 @@ success:
item->type = cJSON_Object; item->type = cJSON_Object;
item->child = head; item->child = head;
return input + 1; input_buffer->offset++;
return buffer_at_offset(input_buffer);
fail: fail:
if (head != NULL) if (head != NULL)

14
tests/parse_object.c
View File

@ -54,14 +54,24 @@ static void assert_is_child(cJSON *child_item, const char *name, int type)
static void assert_not_object(const char *json) static void assert_not_object(const char *json)
{ {
TEST_ASSERT_NULL(parse_object(item, (const unsigned char*)json, &error_pointer, &global_hooks)); parse_buffer parsebuffer;
parsebuffer.content = (const unsigned char*)json;
parsebuffer.length = strlen(json) + sizeof("");
parsebuffer.offset = 0;
TEST_ASSERT_NULL(parse_object(item, &parsebuffer, &error_pointer, &global_hooks));
assert_is_invalid(item); assert_is_invalid(item);
reset(item); reset(item);
} }
static void assert_parse_object(const char *json) static void assert_parse_object(const char *json)
{ {
TEST_ASSERT_NOT_NULL(parse_object(item, (const unsigned char*)json, &error_pointer, &global_hooks)); parse_buffer parsebuffer;
parsebuffer.content = (const unsigned char*)json;
parsebuffer.length = strlen(json) + sizeof("");
parsebuffer.offset = 0;
TEST_ASSERT_NOT_NULL(parse_object(item, &parsebuffer, &error_pointer, &global_hooks));
assert_is_object(item); assert_is_object(item);
} }

8
tests/print_object.c
View File

@ -34,6 +34,12 @@ static void assert_print_object(const char * const expected, const char * const
printbuffer formatted_buffer; printbuffer formatted_buffer;
printbuffer unformatted_buffer; printbuffer unformatted_buffer;
parse_buffer parsebuffer;
/* buffer for parsing */
parsebuffer.content = (const unsigned char*)input;
parsebuffer.length = strlen(input) + sizeof("");
parsebuffer.offset = 0;
/* buffer for formatted printing */ /* buffer for formatted printing */
formatted_buffer.buffer = printed_formatted; formatted_buffer.buffer = printed_formatted;
@ -48,7 +54,7 @@ static void assert_print_object(const char * const expected, const char * const
unformatted_buffer.noalloc = true; unformatted_buffer.noalloc = true;
memset(item, 0, sizeof(item)); memset(item, 0, sizeof(item));
TEST_ASSERT_NOT_NULL_MESSAGE(parse_object(item, (const unsigned char*)input, &error_pointer, &global_hooks), "Failed to parse object."); TEST_ASSERT_NOT_NULL_MESSAGE(parse_object(item, &parsebuffer, &error_pointer, &global_hooks), "Failed to parse object.");
TEST_ASSERT_TRUE_MESSAGE(print_object(item, 0, false, &unformatted_buffer, &global_hooks), "Failed to print unformatted string."); TEST_ASSERT_TRUE_MESSAGE(print_object(item, 0, false, &unformatted_buffer, &global_hooks), "Failed to print unformatted string.");
TEST_ASSERT_EQUAL_STRING_MESSAGE(input, printed_unformatted, "Unformatted object is not correct."); TEST_ASSERT_EQUAL_STRING_MESSAGE(input, printed_unformatted, "Unformatted object is not correct.");