X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fload.c;h=2a360ffa04ff308baa670f03e0341851d9e2eb77;hb=ffbab6fedd86ee1a0c7884d62fa7233ce9d745d2;hp=25df182c4408967022e0989189f7f1cfc7529760;hpb=ee2d164025b5090c7cd81ffd8c1e3e07d45e5d31;p=jansson.git diff --git a/src/load.c b/src/load.c index 25df182..2a360ff 100644 --- a/src/load.c +++ b/src/load.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Petri Lehtinen + * Copyright (c) 2009, 2010 Petri Lehtinen * * Jansson is free software; you can redistribute it and/or modify * it under the terms of the MIT license. See LICENSE for details. @@ -8,11 +8,11 @@ #define _GNU_SOURCE #include #include +#include #include #include #include #include -#include #include #include @@ -52,7 +52,7 @@ typedef struct { int line, column; union { char *string; - int integer; + json_int_t integer; double real; } value; } lex_t; @@ -113,7 +113,8 @@ static void error_set(json_error_t *error, const lex_t *lex, /*** lexical analyzer ***/ -void stream_init(stream_t *stream, get_func get, eof_func eof, void *data) +static void +stream_init(stream_t *stream, get_func get, eof_func eof, void *data) { stream->get = get; stream->eof = eof; @@ -134,10 +135,7 @@ static char stream_get(stream_t *stream, json_error_t *error) c = stream->buffer[0]; - if(c == EOF && stream->eof(stream->data)) - return EOF; - - if(c < 0) + if((unsigned char)c >= 0x80 && c != (char)EOF) { /* multi-byte UTF-8 sequence */ int i, count; @@ -151,7 +149,7 @@ static char stream_get(stream_t *stream, json_error_t *error) for(i = 1; i < count; i++) stream->buffer[i] = stream->get(stream->data); - if(!utf8_check_full(stream->buffer, count)) + if(!utf8_check_full(stream->buffer, count, NULL)) goto out; stream->stream_pos += count; @@ -224,10 +222,10 @@ static void lex_save_cached(lex_t *lex) } /* assumes that str points to 'u' plus at least 4 valid hex digits */ -static int decode_unicode_escape(const char *str) +static int32_t decode_unicode_escape(const char *str) { int i; - int value = 0; + int32_t value = 0; assert(str[0] == 'u'); @@ -257,17 +255,17 @@ static void lex_scan_string(lex_t *lex, json_error_t *error) lex->value.string = NULL; lex->token = TOKEN_INVALID; - /* skip the " */ c = lex_get_save(lex, error); while(c != '"') { - if(c == EOF) { + if(c == (char)EOF) { + lex_unget_unsave(lex, c); if(lex_eof(lex)) error_set(error, lex, "premature end of input"); goto out; } - else if(0 <= c && c <= 0x1F) { + else if((unsigned char)c <= 0x1F) { /* control character */ lex_unget_unsave(lex, c); if(c == '\n') @@ -328,7 +326,7 @@ static void lex_scan_string(lex_t *lex, json_error_t *error) if(*p == 'u') { char buffer[4]; int length; - int value; + int32_t value; value = decode_unicode_escape(p); p += 5; @@ -336,14 +334,15 @@ static void lex_scan_string(lex_t *lex, json_error_t *error) if(0xD800 <= value && value <= 0xDBFF) { /* surrogate pair */ if(*p == '\\' && *(p + 1) == 'u') { - int value2 = decode_unicode_escape(++p); + int32_t value2 = decode_unicode_escape(++p); p += 5; if(0xDC00 <= value2 && value2 <= 0xDFFF) { /* valid second surrogate */ - value = ((value - 0xD800) << 10) + - (value2 - 0xDC00) + - 0x10000; + value = + ((value - 0xD800) << 10) + + (value2 - 0xDC00) + + 0x10000; } else { /* invalid second surrogate */ @@ -402,10 +401,17 @@ out: free(lex->value.string); } -static void lex_scan_number(lex_t *lex, char c, json_error_t *error) +#ifdef JSON_INTEGER_IS_LONG_LONG +#define json_strtoint strtoll +#else +#define json_strtoint strtol +#endif + +static int lex_scan_number(lex_t *lex, char c, json_error_t *error) { const char *saved_text; char *end; + double value; lex->token = TOKEN_INVALID; @@ -419,21 +425,38 @@ static void lex_scan_number(lex_t *lex, char c, json_error_t *error) goto out; } } - else /* c != '0' */ { + else if(isdigit(c)) { c = lex_get_save(lex, error); while(isdigit(c)) c = lex_get_save(lex, error); } + else { + lex_unget_unsave(lex, c); + goto out; + } if(c != '.' && c != 'E' && c != 'e') { + json_int_t value; + lex_unget_unsave(lex, c); - lex->token = TOKEN_INTEGER; saved_text = strbuffer_value(&lex->saved_text); - lex->value.integer = strtol(saved_text, &end, 10); + + errno = 0; + value = json_strtoint(saved_text, &end, 10); + if(errno == ERANGE) { + if(value < 0) + error_set(error, lex, "too big negative integer"); + else + error_set(error, lex, "too big integer"); + goto out; + } + assert(end == saved_text + lex->saved_text.length); - return; + lex->token = TOKEN_INTEGER; + lex->value.integer = value; + return 0; } if(c == '.') { @@ -463,14 +486,22 @@ static void lex_scan_number(lex_t *lex, char c, json_error_t *error) } lex_unget_unsave(lex, c); - lex->token = TOKEN_REAL; saved_text = strbuffer_value(&lex->saved_text); - lex->value.real = strtod(saved_text, &end); + value = strtod(saved_text, &end); assert(end == saved_text + lex->saved_text.length); + if(errno == ERANGE && value != 0) { + error_set(error, lex, "real number overflow"); + goto out; + } + + lex->token = TOKEN_REAL; + lex->value.real = value; + return 0; + out: - return; + return -1; } static int lex_scan(lex_t *lex, json_error_t *error) @@ -480,8 +511,8 @@ static int lex_scan(lex_t *lex, json_error_t *error) strbuffer_clear(&lex->saved_text); if(lex->token == TOKEN_STRING) { - free(lex->value.string); - lex->value.string = NULL; + free(lex->value.string); + lex->value.string = NULL; } c = lex_get(lex, error); @@ -493,7 +524,7 @@ static int lex_scan(lex_t *lex, json_error_t *error) c = lex_get(lex, error); } - if(c == EOF) { + if(c == (char)EOF) { if(lex_eof(lex)) lex->token = TOKEN_EOF; else @@ -509,8 +540,10 @@ static int lex_scan(lex_t *lex, json_error_t *error) else if(c == '"') lex_scan_string(lex, error); - else if(isdigit(c) || c == '-') - lex_scan_number(lex, c, error); + else if(isdigit(c) || c == '-') { + if(lex_scan_number(lex, c, error)) + goto out; + } else if(isupper(c) || islower(c)) { /* eat up the whole identifier for clearer error messages */ @@ -544,6 +577,17 @@ out: return lex->token; } +static char *lex_steal_string(lex_t *lex) +{ + char *result = NULL; + if(lex->token == TOKEN_STRING) + { + result = lex->value.string; + lex->value.string = NULL; + } + return result; +} + static int lex_init(lex_t *lex, get_func get, eof_func eof, void *data) { stream_init(&lex->stream, get, eof, data); @@ -587,7 +631,7 @@ static json_t *parse_object(lex_t *lex, json_error_t *error) goto error; } - key = strdup(lex->value.string); + key = lex_steal_string(lex); if(!key) return NULL; @@ -706,7 +750,7 @@ static json_t *parse_value(lex_t *lex, json_error_t *error) break; case '{': - json = parse_object(lex, error); + json = parse_object(lex, error); break; case '[': @@ -728,7 +772,7 @@ static json_t *parse_value(lex_t *lex, json_error_t *error) return json; } -json_t *parse_json(lex_t *lex, json_error_t *error) +static json_t *parse_json(lex_t *lex, json_error_t *error) { error_init(error); @@ -825,6 +869,8 @@ json_t *json_load_file(const char *path, json_error_t *error) json_t *result; FILE *fp; + error_init(error); + fp = fopen(path, "r"); if(!fp) {