com php-src: Reset utf8_invalid in json scanner: ext/json/json_scanner.c ext/json/json_scanner.re
| From: | Jakub Zelenka | Date: | Thu, 10 Aug 2017 18:47:58 +0000 |
| Subject: | com php-src: Reset utf8_invalid in json scanner: ext/json/json_scanner.c ext/json/json_scanner.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98986@lists.php.net to get a copy of this message | ||
Commit: e53dd027c51368ade5b65e8b18143c488f7871d8
Author: Jakub Zelenka <bukka@php.net> Thu, 10 Aug 2017 19:47:58 +0100
Parents: f5b4cb7130e958eb7e68819353d81f8ff1117258
Branches: PHP-7.2
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e53dd027c51368ade5b65e8b18143c488f7871d8
Log:
Reset utf8_invalid in json scanner
Changed paths:
M ext/json/json_scanner.c
M ext/json/json_scanner.re
Diff:
diff --git a/ext/json/json_scanner.c b/ext/json/json_scanner.c
index 5bc4416..21df55c 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 9d52307..e10d1f2 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);
}