AIR/parson
1
0
Fork 0
mirror of https://github.com/kgabis/parson.git synced 2024-11-24 14:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some extra null checks (issue #60).

Browse Source
This commit is contained in:
Krzysztof Gabis 2016-12-30 23:04:14 +01:00
parent f419334a32
commit defb57f2d3
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
parson.c
View File

@ -820,6 +820,9 @@ static int json_serialize_to_buffer_r(const JSON_Value *value, char *buf, int le
} }
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
key = json_object_get_name(object, i); key = json_object_get_name(object, i);
if (key == NULL) {
return -1;
}
if (is_pretty) { if (is_pretty) {
APPEND_INDENT(level+1); APPEND_INDENT(level+1);
} }
@ -858,6 +861,9 @@ static int json_serialize_to_buffer_r(const JSON_Value *value, char *buf, int le
return written_total; return written_total;
case JSONString: case JSONString:
string = json_value_get_string(value); string = json_value_get_string(value);
if (string == NULL) {
return -1;
}
written = json_serialize_string(string, buf); written = json_serialize_string(string, buf);
if (written < 0) { if (written < 0) {
return -1; return -1;
@ -1354,6 +1360,9 @@ JSON_Value * json_value_deep_copy(const JSON_Value *value) {
return json_value_init_number(json_value_get_number(value)); return json_value_init_number(json_value_get_number(value));
case JSONString: case JSONString:
temp_string = json_value_get_string(value); temp_string = json_value_get_string(value);
if (temp_string == NULL) {
return NULL;
}
temp_string_copy = parson_strdup(temp_string); temp_string_copy = parson_strdup(temp_string);
if (temp_string_copy == NULL) { if (temp_string_copy == NULL) {
return NULL; return NULL;
@ -1916,6 +1925,9 @@ JSON_Status json_value_equals(const JSON_Value *a, const JSON_Value *b) {
case JSONString: case JSONString:
a_string = json_value_get_string(a); a_string = json_value_get_string(a);
b_string = json_value_get_string(b); b_string = json_value_get_string(b);
if (a_string == NULL || b_string == NULL) {
return 0; /* shouldn't happen */
}
return strcmp(a_string, b_string) == 0; return strcmp(a_string, b_string) == 0;
case JSONBoolean: case JSONBoolean:
return json_value_get_boolean(a) == json_value_get_boolean(b); return json_value_get_boolean(a) == json_value_get_boolean(b);