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_Print: Use reallocate if available

Browse Source 
This can reduce worst case peak memory usage by 30% depending on the
realloc implementation.
This commit is contained in:
Max Bruckner 2017-03-22 17:31:44 +01:00
parent 281df6997c
commit 218b0c8dcf
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cJSON.c
View File

@ -1055,17 +1055,28 @@ static unsigned char *print(const cJSON * const item, cJSON_bool format, const i
}
update_offset(buffer);
/* copy the buffer over to a new one */
printed = (unsigned char*) hooks->allocate(buffer->offset + 1);
if (printed == NULL)
/* check if reallocate is available */
if (hooks->reallocate != NULL)
{
goto fail;
printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->length);
buffer->buffer = NULL;
if (printed == NULL) {
goto fail;
}
}
strncpy((char*)printed, (char*)buffer->buffer, min(buffer->length, buffer->offset + 1));
printed[buffer->offset] = '\0'; /* just to be sure */
else /* otherwise copy the JSON over to a new buffer */
{
printed = (unsigned char*) hooks->allocate(buffer->offset + 1);
if (printed == NULL)
{
goto fail;
}
memcpy(printed, buffer->buffer, min(buffer->length, buffer->offset + 1));
printed[buffer->offset] = '\0'; /* just to be sure */
/* free the buffer */
hooks->deallocate(buffer->buffer);
/* free the buffer */
hooks->deallocate(buffer->buffer);
}
return printed;