ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-01-22 04:18:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix null dereferences

Browse Source
This commit is contained in:
Eric Fischer 2014-02-05 17:28:45 -08:00
parent 558c47c498
commit 3e049754d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
json.c
View File

@ -162,7 +162,7 @@ json_object *json_parse(FILE *f, json_object *current) {
if (current->parent == NULL || if (current->parent == NULL ||
(current->parent->type != JSON_ARRAY && (current->parent->type != JSON_ARRAY &&
current->parent->type != JSON_HASH)) { current->parent->type != JSON_HASH)) {
json_error(", not in array or hash: %d\n", current->parent->type); json_error(", not in array or hash\n");
} }
return json_parse(f, current->parent); return json_parse(f, current->parent);
@ -170,10 +170,10 @@ json_object *json_parse(FILE *f, json_object *current) {
if (c == ':') { if (c == ':') {
if (current->parent == NULL || current->parent->type != JSON_HASH) { if (current->parent == NULL || current->parent->type != JSON_HASH) {
json_error(": not in hash: %d\n", current->parent); json_error(": not in hash\n");
} }
if (current->parent->hash == NULL || current->parent->hash->value != NULL) { if (current->parent->hash == NULL || current->parent->hash->key == NULL) {
json_error(": without key: %d\n", current->parent); json_error(": without key\n");
} }
return json_parse(f, current->parent); return json_parse(f, current->parent);