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

Add numbers (and a buffer overflow risk to fix)

Browse Source
This commit is contained in:
Eric Fischer 2014-02-05 16:23:01 -08:00
parent 7865a9757e
commit 2a7fa98a3a
1 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
json.c
View File

@ -62,6 +62,12 @@ static void json_error(char *s) {
exit(EXIT_FAILURE);
}
int peek(FILE *f) {
int c = getc(f);
ungetc(c, f);
return c;
}
json_object *parse(FILE *f, json_object *current) {
int c = getc(f);
if (c == EOF) {
@ -139,4 +145,54 @@ json_object *parse(FILE *f, json_object *current) {
return parse(f, current);
}
if (c == '-' || (c >= '0' && c <= '9')) {
#define MAX 500
char val[MAX];
int off = 0;
val[off++] = c;
if (c >= '1' && c <= '9') {
c = peek(f);
while (c >= '0' && c <= '9') {
val[off++] = getc(f);
c = peek(f);
}
}
if (peek(f) == '.') {
val[off++] = getc(f);
c = peek(f);
while (c >= '0' && c <= '9') {
val[off++] = getc(f);
c = peek(f);
}
}
c = peek(f);
if (c == 'e' || c == 'E') {
val[off++] = getc(f);
c = peek(f);
if (c == '+' || c == '-') {
val[off++] = getc(f);
}
c = peek(f);
while (c >= '0' && c <= '9') {
val[off++] = getc(f);
c = peek(f);
}
}
val[off++] = '\0';
json_object *n = add_object(JSON_NUMBER, current);
n->number = atof(val);
return n;
}
}