com php-src: Patch from the upstream git https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228): ext/mbstring/oniguruma/regparse.c
| From: | Remi Collet | Date: | Wed, 05 Jul 2017 07:26:06 +0000 |
| Subject: | com php-src: Patch from the upstream git https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228): ext/mbstring/oniguruma/regparse.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98365@lists.php.net to get a copy of this message | ||
Commit: 703be4f77e662837b64499b0d046a5c8d06a98b9
Author: Remi Collet <remi@php.net> Tue, 30 May 2017 15:40:32 +0200
Parents: 27a743b82b0b8d7e8e8154f3cc402204fea0ebd3
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=703be4f77e662837b64499b0d046a5c8d06a98b9
Log:
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/60
(CVE-2017-9228)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
Changed paths:
M ext/mbstring/oniguruma/regparse.c
Diff:
diff --git a/ext/mbstring/oniguruma/regparse..c b/ext/mbstring/oniguruma/regparse.c
index c6822e6..d2925f1 100644
--- a/ext/mbstring/oniguruma/regparse.c
+++ b/ext/mbstring/oniguruma/regparse.c
@@ -4068,7 +4068,9 @@ next_state_class(CClassNode* cc, OnigCodePoint* vs, enum CCVALTYPE* type,
}
}
- *state = CCS_VALUE;
+ if (*state != CCS_START)
+ *state = CCS_VALUE;
+
*type = CCV_CLASS;
return 0;
}