3party/cJSON
0
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2024-12-26 21:04:24 +08:00
Code Issues Projects Releases Wiki Activity

Set free'd pointers to NULL whenever they are not reassigned immediately after

Browse Source
This commit is contained in:
maebex 2024-03-30 10:42:22 +01:00 committed by Alan Wang
parent a20be7996d
commit 542fb0eadd
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cJSON.c
View File

@ -263,10 +263,12 @@ CJSON_PUBLIC(void) cJSON_Delete(cJSON *item)
if (!(item->type & cJSON_IsReference) && (item->valuestring != NULL)) if (!(item->type & cJSON_IsReference) && (item->valuestring != NULL))
{ {
global_hooks.deallocate(item->valuestring); global_hooks.deallocate(item->valuestring);
item->valuestring = NULL;
} }
if (!(item->type & cJSON_StringIsConst) && (item->string != NULL)) if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
{ {
global_hooks.deallocate(item->string); global_hooks.deallocate(item->string);
item->string = NULL;
} }
global_hooks.deallocate(item); global_hooks.deallocate(item);
item = next; item = next;
@ -894,6 +896,7 @@ fail:
if (output != NULL) if (output != NULL)
{ {
input_buffer->hooks.deallocate(output); input_buffer->hooks.deallocate(output);
output = NULL;
} }
if (input_pointer != NULL) if (input_pointer != NULL)
@ -1236,6 +1239,7 @@ static unsigned char *print(const cJSON * const item, cJSON_bool format, const i
/* free the buffer */ /* free the buffer */
hooks->deallocate(buffer->buffer); hooks->deallocate(buffer->buffer);
buffer->buffer = NULL;
} }
return printed; return printed;
@ -1244,11 +1248,13 @@ fail:
if (buffer->buffer != NULL) if (buffer->buffer != NULL)
{ {
hooks->deallocate(buffer->buffer); hooks->deallocate(buffer->buffer);
buffer->buffer = NULL;
} }
if (printed != NULL) if (printed != NULL)
{ {
hooks->deallocate(printed); hooks->deallocate(printed);
printed = NULL;
} }
return NULL; return NULL;
@ -1289,6 +1295,7 @@ CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON
if (!print_value(item, &p)) if (!print_value(item, &p))
{ {
global_hooks.deallocate(p.buffer); global_hooks.deallocate(p.buffer);
p.buffer = NULL;
return NULL; return NULL;
} }
@ -3132,4 +3139,5 @@ CJSON_PUBLIC(void *) cJSON_malloc(size_t size)
CJSON_PUBLIC(void) cJSON_free(void *object) CJSON_PUBLIC(void) cJSON_free(void *object)
{ {
global_hooks.deallocate(object); global_hooks.deallocate(object);
object = NULL;
} }