diff options
| -rw-r--r-- | ext/json/Makefile.frag | 2 | ||||
| -rw-r--r-- | ext/json/json_parser.y | 3 | ||||
| -rw-r--r-- | ext/json/json_scanner.re | 10 | ||||
| -rw-r--r-- | ext/json/php_json_scanner.h | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/ext/json/Makefile.frag b/ext/json/Makefile.frag index 1632b448fe..cb26acabc7 100644 --- a/ext/json/Makefile.frag +++ b/ext/json/Makefile.frag @@ -1,5 +1,5 @@ $(srcdir)/json_scanner.c: $(srcdir)/json_scanner.re - $(RE2C) -t php_json_scanner_defs.h --no-generation-date -bci -o $@ json_scanner.re + $(RE2C) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re $(srcdir)/json_parser.tab.c: $(srcdir)/json_parser.y $(YACC) --defines -l $(srcdir)/json_parser.y -o $@ diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y index fb75aad9de..1d0620a9f8 100644 --- a/ext/json/json_parser.y +++ b/ext/json/json_parser.y @@ -214,7 +214,8 @@ void php_json_parser_array_append(zval *array, zval *zvalue) int php_json_yylex(union YYSTYPE *value, php_json_parser *parser) { - int token = php_json_scan(&parser->scanner); + TSRMLS_FETCH_FROM_CTX(parser->zts_ctx); + int token = php_json_scan(&parser->scanner TSRMLS_CC); value->value = parser->scanner.value; return token; } diff --git a/ext/json/json_scanner.re b/ext/json/json_scanner.re index 7fa9352c09..99e63bbb41 100644 --- a/ext/json/json_scanner.re +++ b/ext/json/json_scanner.re @@ -40,6 +40,8 @@ #define PHP_JSON_SCANNER_COPY_UTF() php_json_scanner_copy_string(s, 5) #define PHP_JSON_SCANNER_COPY_UTF_SP() php_json_scanner_copy_string(s, 11) +#define PHP_JSON_INT_MAX_LENGTH (MAX_LENGTH_OF_LONG - 1) + static void php_json_scanner_copy_string(php_json_scanner *s, int esc_size) { @@ -87,7 +89,7 @@ void php_json_scanner_init(php_json_scanner *s, char *str, int str_len, long opt PHP_JSON_CONDITION_SET(JS); } -int php_json_scan(php_json_scanner *s) +int php_json_scan(php_json_scanner *s TSRMLS_DC) { ZVAL_NULL(&s->value); @@ -160,7 +162,7 @@ std: size_t digits = (size_t) (s->cursor - s->token - negative); if (digits >= PHP_JSON_INT_MAX_LENGTH) { if (digits == PHP_JSON_INT_MAX_LENGTH) { - int cmp = strncmp((char *) (s->token + negative), PHP_JSON_INT_MAX_DIGITS, PHP_JSON_INT_MAX_LENGTH); + int cmp = strncmp((char *) (s->token + negative), LONG_MIN_DIGITS, PHP_JSON_INT_MAX_LENGTH); if (!(cmp < 0 || (cmp == 0 && negative))) { bigint = 1; } @@ -172,7 +174,7 @@ std: ZVAL_LONG(&s->value, strtol((char *) s->token, NULL, 10)); return PHP_JSON_T_INT; } else if (s->options & PHP_JSON_BIGINT_AS_STRING) { - ZVAL_STRINGL(&s->value, (char *) s->token, s->cursor - s->token, 1); + ZVAL_STRINGL(&s->value, (char *) s->token, s->cursor - s->token); return PHP_JSON_T_STRING; } else { ZVAL_DOUBLE(&s->value, zend_strtod((char *) s->token, NULL)); @@ -241,7 +243,7 @@ std: } str = emalloc(len + 1); str[len] = 0; - ZVAL_STRINGL(&s->value, str, len, 0); + ZVAL_STRINGL(&s->value, str, len); if (s->str_esc) { s->pstr = (php_json_ctype *) Z_STRVAL(s->value); s->cursor = s->str_start; diff --git a/ext/json/php_json_scanner.h b/ext/json/php_json_scanner.h index fbf65eac70..203465466b 100644 --- a/ext/json/php_json_scanner.h +++ b/ext/json/php_json_scanner.h @@ -41,7 +41,7 @@ typedef struct _php_json_scanner { void php_json_scanner_init(php_json_scanner *scanner, char *str, int str_len, long options); -int php_json_scan(php_json_scanner *s); +int php_json_scan(php_json_scanner *s TSRMLS_DC); #endif /* PHP_JSON_SCANNER_H */ |