diff options
| author | Jakub Zelenka <bukka@php.net> | 2017-08-10 19:47:58 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2017-08-10 19:47:58 +0100 |
| commit | e53dd027c51368ade5b65e8b18143c488f7871d8 (patch) | |
| tree | 3ca999cc27167f208cb638f8d3af967593bb20b9 | |
| parent | f5b4cb7130e958eb7e68819353d81f8ff1117258 (diff) | |
| download | php-git-e53dd027c51368ade5b65e8b18143c488f7871d8.tar.gz | |
Reset utf8_invalid in json scanner
| -rw-r--r-- | ext/json/json_scanner.c | 1 | ||||
| -rw-r--r-- | ext/json/json_scanner.re | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ext/json/json_scanner.c b/ext/json/json_scanner.c index 5bc4416e95..21df55ccfc 100644 --- a/ext/json/json_scanner.c +++ b/ext/json/json_scanner.c @@ -292,6 +292,7 @@ yy14: { s->str_start = s->cursor; s->str_esc = 0; + s->utf8_invalid = 0; s->utf8_invalid_count = 0; PHP_JSON_CONDITION_SET_AND_GOTO(STR_P1); } diff --git a/ext/json/json_scanner.re b/ext/json/json_scanner.re index 9d52307be9..e10d1f23f6 100644 --- a/ext/json/json_scanner.re +++ b/ext/json/json_scanner.re @@ -209,6 +209,7 @@ std: <JS>["] { s->str_start = s->cursor; s->str_esc = 0; + s->utf8_invalid = 0; s->utf8_invalid_count = 0; PHP_JSON_CONDITION_SET_AND_GOTO(STR_P1); } |