Merge branch 'PHP-7.2' into PHP-7.3

remicollet · remicollet · commit b9072788cd86 · 2019-01-08T09:34:05.000+01:00
* PHP-7.2:
  cleanup merge
diff --git a/ext/mbstring/oniguruma/src/regparse.c b/ext/mbstring/oniguruma/src/regparse.c
@@ -5412,7 +5412,6 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
           tok->u.code = c2;
         }
         else { /* string */
-          p = tok->backp + enclen(enc, tok->backp);
           int len;
           SAFE_ENC_LEN(enc, tok->backp, end, len);
           p = tok->backp + len;

Original file line number	Diff line number	Diff line change
`@@ -5412,7 +5412,6 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)`
`5412`	`5412`	`tok->u.code = c2;`
`5413`	`5413`	`}`
`5414`	`5414`	`else { /* string */`
`5415`		`- p = tok->backp + enclen(enc, tok->backp);`
`5416`	`5415`	`int len;`
`5417`	`5416`	`SAFE_ENC_LEN(enc, tok->backp, end, len);`
`5418`	`5417`	`p = tok->backp + len;`