AIR/parson
1
0
Fork 0
mirror of https://github.com/kgabis/parson.git synced 2025-05-10 03:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes memory leaks.

Browse Source 
Thanks to Thales de Carvalho for finding this and submitting a patch.
This commit is contained in:
Krzysztof Gabis 2017-03-09 20:59:22 +00:00
parent ba2a854c27
commit 20ad63f8ff
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
parson.c
View File

@ -566,9 +566,12 @@ static char* process_string(const char *input, size_t len) {
const char *input_ptr = input; const char *input_ptr = input;
size_t initial_size = (len + 1) * sizeof(char); size_t initial_size = (len + 1) * sizeof(char);
size_t final_size = 0; size_t final_size = 0;
char *output = (char*)parson_malloc(initial_size); char *output = NULL, *output_ptr = NULL, *resized_output = NULL;
char *output_ptr = output; output = (char*)parson_malloc(initial_size);
char *resized_output = NULL; if (output == NULL) {
goto error;
}
output_ptr = output;
while ((*input_ptr != '\0') && (size_t)(input_ptr - input) < len) { while ((*input_ptr != '\0') && (size_t)(input_ptr - input) < len) {
if (*input_ptr == '\\') { if (*input_ptr == '\\') {
input_ptr++; input_ptr++;
@ -678,9 +681,9 @@ static JSON_Value * parse_object_value(const char **string, size_t nesting) {
json_value_free(output_value); json_value_free(output_value);
return NULL; return NULL;
} }
if(json_object_add(output_object, new_key, new_value) == JSONFailure) { if (json_object_add(output_object, new_key, new_value) == JSONFailure) {
parson_free(new_key); parson_free(new_key);
parson_free(new_value); json_value_free(new_value);
json_value_free(output_value); json_value_free(output_value);
return NULL; return NULL;
} }
@ -716,12 +719,12 @@ static JSON_Value * parse_array_value(const char **string, size_t nesting) {
} }
while (**string != '\0') { while (**string != '\0') {
new_array_value = parse_value(string, nesting); new_array_value = parse_value(string, nesting);
if (!new_array_value) { if (new_array_value == NULL) {
json_value_free(output_value); json_value_free(output_value);
return NULL; return NULL;
} }
if (json_array_add(output_array, new_array_value) == JSONFailure) { if (json_array_add(output_array, new_array_value) == JSONFailure) {
parson_free(new_array_value); json_value_free(new_array_value);
json_value_free(output_value); json_value_free(output_value);
return NULL; return NULL;
} }
@ -1829,11 +1832,10 @@ JSON_Status json_object_dotremove(JSON_Object *object, const char *name) {
} else { } else {
current_name = parson_strndup(name, dot_pos - name); current_name = parson_strndup(name, dot_pos - name);
temp_obj = json_object_get_object(object, current_name); temp_obj = json_object_get_object(object, current_name);
parson_free(current_name);
if (temp_obj == NULL) { if (temp_obj == NULL) {
parson_free(current_name);
return JSONFailure; return JSONFailure;
} }
parson_free(current_name);
return json_object_dotremove(temp_obj, dot_pos + 1); return json_object_dotremove(temp_obj, dot_pos + 1);
} }
} }