diff options
| author | Remi Collet <remi@php.net> | 2017-05-30 15:38:17 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-07-05 09:25:49 +0200 |
| commit | bdf7393ddb15d0ac522250a9825b685437e2b966 (patch) | |
| tree | eb0489df6dfec6e2f406287b3f1e25df06b6b37f | |
| parent | 2693e52113ea0369144073e84d568931ffc173a7 (diff) | |
| download | php-git-bdf7393ddb15d0ac522250a9825b685437e2b966.tar.gz | |
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
| -rw-r--r-- | ext/mbstring/oniguruma/regexec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mbstring/oniguruma/regexec.c b/ext/mbstring/oniguruma/regexec.c index 5e26896e36..97d5f32d28 100644 --- a/ext/mbstring/oniguruma/regexec.c +++ b/ext/mbstring/oniguruma/regexec.c @@ -3123,6 +3123,8 @@ forward_search_range(regex_t* reg, const UChar* str, const UChar* end, UChar* s, } else { UChar *q = p + reg->dmin; + + if (q >= end) return 0; /* fail */ while (p < q) p += enclen(reg->enc, p); } } |