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

Clean up after errors and fix related bugs:

Browse Source 
It was freeing the wrong object when there was an error
attaching an object to its parent!

Don't crash when printing null (partially read) hash values.
This commit is contained in:
Eric Fischer 2014-02-08 09:30:02 -08:00
parent 5e6fa6f8dc
commit b72bb6f1f4
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jsoncat.c
View File

@ -52,7 +52,10 @@ void json_print_one(json_object *j, int *depth) {
}
void json_print(json_object *j, int depth) {
if (j->type == JSON_HASH) {
if (j == NULL) {
// Hash value in incompletely read hash
printf("NULL");
} else if (j->type == JSON_HASH) {
printf("{\n");
indent(depth + 1);
@ -123,7 +126,9 @@ void process_callback(FILE *f, char *fname) {
}
if (jp->error != NULL) {
fflush(stdout);
fprintf(stderr, "%s: %d: %s\n", fname, jp->line, jp->error);
json_free(jp->root);
}
json_end(jp);

11
jsonpull.c
View File

@ -5,12 +5,15 @@
#include <stdarg.h>
#include "jsonpull.h"
#include "debug.h"
json_pull *json_begin(int (*read)(struct json_pull *), int (*peek)(struct json_pull *), void *source) {
json_pull *j = malloc(sizeof(json_pull));
j->error = NULL;
j->line = 1;
j->container = NULL;
j->root = NULL;
j->read = read;
j->peek = peek;
@ -97,7 +100,7 @@ static json_object *add_object(json_pull *j, json_type type) {
c->expect = JSON_COMMA;
} else {
j->error = "Expected a comma, not a list item";
free(c);
free(o);
return NULL;
}
} else if (c->type == JSON_HASH) {
@ -107,7 +110,7 @@ static json_object *add_object(json_pull *j, json_type type) {
} else if (c->expect == JSON_KEY) {
if (type != JSON_STRING) {
j->error = "Hash key is not a string";
free(c);
free(o);
return NULL;
}
@ -122,10 +125,12 @@ static json_object *add_object(json_pull *j, json_type type) {
c->expect = JSON_COLON;
} else {
j->error = "Expected a comma or colon";
free(c);
free(o);
return NULL;
}
}
} else {
j->root = o;
}
return o;

1
jsonpull.h
View File

@ -33,6 +33,7 @@ typedef struct json_pull {
void *source;
json_object *container;
json_object *root;
} json_pull;
json_pull *json_begin_file(FILE *f);