diff options
| author | Remi Collet <remi@php.net> | 2017-05-30 15:40:32 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-05-30 15:40:32 +0200 |
| commit | 1c845d295037702d63097e2216b3c5db53f79273 (patch) | |
| tree | 172fb1187c2d26cd6590a838fc2c73af469504e3 | |
| parent | 5416deec665db293ae25548828791453d776a6bf (diff) | |
| download | php-git-1c845d295037702d63097e2216b3c5db53f79273.tar.gz | |
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
| -rw-r--r-- | ext/mbstring/oniguruma/regparse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/mbstring/oniguruma/regparse.c b/ext/mbstring/oniguruma/regparse.c index c6822e6267..d2925f1e81 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; } |