diff options
| author | Remi Collet <remi@php.net> | 2019-01-08 09:34:05 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2019-01-08 09:34:05 +0100 |
| commit | b9072788cd86cc1490972314dce2fcd92666e586 (patch) | |
| tree | 1aec7c7626932bcb8dc0a0503dcccbaedba55367 | |
| parent | f7a7d32e6528f3826bc68a6f64071d40d838d2eb (diff) | |
| parent | 0d9935739c3a035f74b54aa518f2497975402864 (diff) | |
| download | php-git-b9072788cd86cc1490972314dce2fcd92666e586.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
cleanup merge
| -rw-r--r-- | ext/mbstring/oniguruma/src/regparse.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/mbstring/oniguruma/src/regparse.c b/ext/mbstring/oniguruma/src/regparse.c index ea537a8cfb..ac5774bb2b 100644 --- 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; |