From bdf7393ddb15d0ac522250a9825b685437e2b966 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 May 2017 15:38:17 +0200 Subject: Patch from the upstream git https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227) Thanks to Mamoru TASAKA --- ext/mbstring/oniguruma/regexec.c | 2 ++ 1 file changed, 2 insertions(+) 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); } } -- cgit v1.2.1