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

ensure: use realloc if possible

Browse Source
This commit is contained in:
Max Bruckner 2017-02-18 03:31:08 +01:00
parent fc1d4b07df
commit 4fff92140e
1 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
cJSON.c
View File

@ -81,6 +81,7 @@ static int cJSON_strcasecmp(const unsigned char *s1, const unsigned char *s2)
static void *(*cJSON_malloc)(size_t sz) = malloc; static void *(*cJSON_malloc)(size_t sz) = malloc;
static void (*cJSON_free)(void *ptr) = free; static void (*cJSON_free)(void *ptr) = free;
static void *(*cJSON_realloc)(void *pointer, size_t size) = realloc;
static unsigned char* cJSON_strdup(const unsigned char* str) static unsigned char* cJSON_strdup(const unsigned char* str)
{ {
@ -104,16 +105,33 @@ static unsigned char* cJSON_strdup(const unsigned char* str)
void cJSON_InitHooks(cJSON_Hooks* hooks) void cJSON_InitHooks(cJSON_Hooks* hooks)
{ {
if (!hooks) if (hooks == NULL)
{ {
/* Reset hooks */ /* Reset hooks */
cJSON_malloc = malloc; cJSON_malloc = malloc;
cJSON_free = free; cJSON_free = free;
cJSON_realloc = realloc;
return; return;
} }
cJSON_malloc = (hooks->malloc_fn) ? hooks->malloc_fn : malloc; cJSON_malloc = malloc;
cJSON_free = (hooks->free_fn) ? hooks->free_fn : free; if (hooks->malloc_fn != NULL)
{
cJSON_malloc = hooks->malloc_fn;
}
cJSON_free = free;
if (hooks->free_fn != NULL)
{
cJSON_free = hooks->free_fn;
}
/* use realloc only if both free and malloc are used */
cJSON_realloc = NULL;
if ((cJSON_malloc == malloc) && (cJSON_free == free))
{
cJSON_realloc = realloc;
}
} }
/* Internal constructor. */ /* Internal constructor. */
@ -263,20 +281,29 @@ static unsigned char* ensure(printbuffer *p, size_t needed)
} }
} }
newbuffer = (unsigned char*)cJSON_malloc(newsize); if (cJSON_realloc != NULL)
if (!newbuffer)
{ {
cJSON_free(p->buffer); /* reallocate with realloc if available */
p->length = 0; newbuffer = (unsigned char*)cJSON_realloc(p->buffer, newsize);
p->buffer = NULL; }
else
{
/* otherwise reallocate manually */
newbuffer = (unsigned char*)cJSON_malloc(newsize);
if (!newbuffer)
{
cJSON_free(p->buffer);
p->length = 0;
p->buffer = NULL;
return NULL; return NULL;
}
if (newbuffer)
{
memcpy(newbuffer, p->buffer, p->length);
}
cJSON_free(p->buffer);
} }
if (newbuffer)
{
memcpy(newbuffer, p->buffer, p->length);
}
cJSON_free(p->buffer);
p->length = newsize; p->length = newsize;
p->buffer = newbuffer; p->buffer = newbuffer;