diff options
| author | Remi Collet <remi@php.net> | 2017-05-30 15:37:11 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-05-30 15:37:11 +0200 |
| commit | 60b1829e1cd18facc696264fd830c4bbd593cfa9 (patch) | |
| tree | abe38ed8303bb1bcbf0f3a7f1b478a35b1d14b5e | |
| parent | 1e0c4386ab87c6f6392933450130470cbd1a2b19 (diff) | |
| download | php-git-60b1829e1cd18facc696264fd830c4bbd593cfa9.tar.gz | |
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
| -rw-r--r-- | ext/mbstring/oniguruma/regexec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ext/mbstring/oniguruma/regexec.c b/ext/mbstring/oniguruma/regexec.c index 7430d78514..5e26896e36 100644 --- a/ext/mbstring/oniguruma/regexec.c +++ b/ext/mbstring/oniguruma/regexec.c @@ -1425,14 +1425,9 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, break; case OP_EXACT1: MOP_IN(OP_EXACT1); -#if 0 DATA_ENSURE(1); if (*p != *s) goto fail; p++; s++; -#endif - if (*p != *s++) goto fail; - DATA_ENSURE(0); - p++; MOP_OUT; break; |