3party/cJSON
0
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2025-01-14 03:18:00 +08:00
Code Issues Projects Releases Wiki Activity

allocation helpers for allocating with a configuration

Browse Source
This commit is contained in:
Max Bruckner 2018-02-01 10:51:38 +01:00
parent 440ba84d08
commit d67ddd5c62
1 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cJSON.c
View File

@ -168,6 +168,20 @@ static void global_deallocate_wrapper(void *pointer, void *userdata)
global_allocators.free_fn(pointer);
}
/* helpers to allocate memory from a configuration */
static void *allocate(const internal_configuration * const configuration, size_t size)
{
return configuration->allocators.allocate(size, configuration->userdata);
}
static void *reallocate(const internal_configuration * const configuration, void *pointer, size_t size)
{
return configuration->allocators.reallocate(pointer, size, configuration->userdata);
}
static void deallocate(const internal_configuration * const configuration, void *pointer)
{
configuration->allocators.deallocate(pointer, configuration->userdata);
}
#define default_configuration {\
256, /* default buffer size */\
true, /* enable formatting by default */\
@ -194,7 +208,7 @@ static unsigned char* custom_strdup(const unsigned char* string, const internal_
}
length = strlen((const char*)string) + sizeof("");
copy = (unsigned char*)configuration->allocators.allocate(length, configuration->userdata);
copy = (unsigned char*)allocate(configuration, length);
if (copy == NULL)
{
return NULL;
@ -244,7 +258,7 @@ CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks)
/* Internal constructor. */
static cJSON *create_item(const internal_configuration * const configuration)
{
cJSON* node = (cJSON*)configuration->allocators.allocate(sizeof(cJSON), configuration->userdata);
cJSON* node = (cJSON*)allocate(configuration, sizeof(cJSON));
if (node)
{
memset(node, '\0', sizeof(cJSON));
@ -266,13 +280,13 @@ static void delete_item(cJSON *item, const internal_configuration * const config
}
if (!(item->type & cJSON_IsReference) && (item->valuestring != NULL))
{
configuration->allocators.deallocate(item->valuestring, configuration->userdata);
deallocate(configuration, item->valuestring);
}
if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
{
configuration->allocators.deallocate(item->string, configuration->userdata);
deallocate(configuration, item->string);
}
configuration->allocators.deallocate(item, configuration->userdata);
deallocate(configuration, item);
item = next;
}
}
@ -457,13 +471,13 @@ static unsigned char* ensure(printbuffer * const p, size_t needed)
newsize = needed * 2;
}
if (*p->configuration.allocators.reallocate != NULL)
if (p->configuration.allocators.reallocate != NULL)
{
/* reallocate with realloc if available */
newbuffer = (unsigned char*)p->configuration.allocators.reallocate(p->buffer, newsize, p->configuration.userdata);
newbuffer = (unsigned char*)reallocate(&p->configuration, p->buffer, newsize);
if (newbuffer == NULL)
{
p->configuration.allocators.deallocate(p->buffer, p->configuration.userdata);
deallocate(&p->configuration, p->buffer);
p->length = 0;
p->buffer = NULL;
@ -473,10 +487,10 @@ static unsigned char* ensure(printbuffer * const p, size_t needed)
else
{
/* otherwise reallocate manually */
newbuffer = (unsigned char*)p->configuration.allocators.allocate(newsize, p->configuration.userdata);
newbuffer = (unsigned char*)allocate(&p->configuration, newsize);
if (!newbuffer)
{
p->configuration.allocators.deallocate(p->buffer, p->configuration.userdata);
deallocate(&p->configuration, p->buffer);
p->length = 0;
p->buffer = NULL;
@ -486,7 +500,7 @@ static unsigned char* ensure(printbuffer * const p, size_t needed)
{
memcpy(newbuffer, p->buffer, p->offset + 1);
}
p->configuration.allocators.deallocate(p->buffer, p->configuration.userdata);
deallocate(&p->configuration, p->buffer);
}
p->length = newsize;
p->buffer = newbuffer;
@ -778,7 +792,7 @@ static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_bu
/* This is at most how much we need for the output */
allocation_length = (size_t) (input_end - buffer_at_offset(input_buffer)) - skipped_bytes;
output = (unsigned char*)input_buffer->configuration.allocators.allocate(allocation_length + sizeof(""), input_buffer->configuration.userdata);
output = (unsigned char*)allocate(&input_buffer->configuration, allocation_length + sizeof(""));
if (output == NULL)
{
goto fail; /* allocation failure */
@ -856,7 +870,7 @@ static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_bu
fail:
if (output != NULL)
{
input_buffer->configuration.allocators.deallocate(output, input_buffer->configuration.userdata);
deallocate(&input_buffer->configuration, output);
}
if (input_pointer != NULL)
@ -1147,7 +1161,7 @@ static unsigned char *print(const cJSON * const item, const internal_configurati
memset(buffer, 0, sizeof(buffer));
/* create buffer */
buffer->buffer = (unsigned char*)configuration->allocators.allocate(configuration->buffer_size, configuration->userdata);
buffer->buffer = (unsigned char*)allocate(configuration, configuration->buffer_size);
buffer->length = configuration->buffer_size;
buffer->configuration = *configuration;
if (buffer->buffer == NULL)
@ -1167,7 +1181,7 @@ static unsigned char *print(const cJSON * const item, const internal_configurati
/* check if reallocate is available */
if (configuration->allocators.reallocate != NULL)
{
printed = (unsigned char*)configuration->allocators.reallocate(buffer->buffer, buffer->offset + 1, configuration->userdata);
printed = (unsigned char*)reallocate(configuration, buffer->buffer, buffer->offset + 1);
buffer->buffer = NULL;
if (printed == NULL) {
goto fail;
@ -1175,7 +1189,7 @@ static unsigned char *print(const cJSON * const item, const internal_configurati
}
else /* otherwise copy the JSON over to a new buffer */
{
printed = (unsigned char*)configuration->allocators.allocate(buffer->offset + 1, configuration->userdata);
printed = (unsigned char*)allocate(configuration, buffer->offset + 1);
if (printed == NULL)
{
goto fail;
@ -1184,7 +1198,7 @@ static unsigned char *print(const cJSON * const item, const internal_configurati
printed[buffer->offset] = '\0'; /* just to be sure */
/* free the buffer */
configuration->allocators.deallocate(buffer->buffer, configuration->userdata);
deallocate(configuration, buffer->buffer);
}
return printed;
@ -1192,12 +1206,12 @@ static unsigned char *print(const cJSON * const item, const internal_configurati
fail:
if (buffer->buffer != NULL)
{
configuration->allocators.deallocate(buffer->buffer, configuration->userdata);
deallocate(configuration, buffer->buffer);
}
if (printed != NULL)
{
configuration->allocators.deallocate(printed, configuration->userdata);
deallocate(configuration, printed);
}
return NULL;
@ -1378,7 +1392,7 @@ static cJSON_bool print_value(const cJSON * const item, printbuffer * const outp
{
if (!output_buffer->noalloc)
{
output_buffer->configuration.allocators.deallocate(output_buffer->buffer, output_buffer->configuration.userdata);
deallocate(&output_buffer->configuration, output_buffer->buffer);
}
return false;
}
@ -1986,7 +2000,7 @@ static cJSON_bool add_item_to_object(cJSON * const object, const char * const st
if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
{
configuration->allocators.deallocate(item->string, configuration->userdata);
deallocate(configuration, item->string);
}
if (constant_key)
@ -2993,10 +3007,10 @@ CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * cons
CJSON_PUBLIC(void *) cJSON_malloc(size_t size)
{
return global_configuration.allocators.allocate(size, global_configuration.userdata);
return global_allocators.malloc_fn(size);
}
CJSON_PUBLIC(void) cJSON_free(void *object)
{
global_configuration.allocators.deallocate(object, global_configuration.userdata);
global_allocators.free_fn(object);
}