com php-src: Patch from the upstream git https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224): ext/mbstring/oniguruma/regexec.c

From: Date: Wed, 05 Jul 2017 07:25:39 +0000
Subject: com php-src: Patch from the upstream git https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224): ext/mbstring/oniguruma/regexec.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98364@lists.php.net to get a copy of this message
Commit: 2693e52113ea0369144073e84d568931ffc173a7 Author: Remi Collet <remi@php.net> Tue, 30 May 2017 15:37:11 +0200 Parents: 4e68b2c52b1f7bb899295521df15c631a37b3994 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2693e52113ea0369144073e84d568931ffc173a7 Log: Patch from the upstream git https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224) Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org> Changed paths: M ext/mbstring/oniguruma/regexec.c Diff: diff --git a/ext/mbstring/oniguruma/regexec.c b/ext/mbstring/oniguruma/regexec.c index 7430d78..5e26896 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;

« previous php.cvs (#98364) next »