From: K.Kosako <kkosako0@gmail.com>
Date: Mon, 21 Sep 2020 03:58:29 +0000 (+0900)
Subject: Fix out-of-bounds write
X-Git-Tag: php-7.3.24RC1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf6873a18e3b6b00f82a645c0893a281ae8eadb8;p=php

Fix out-of-bounds write

Fixes CVE-2020-26159.

Backported from <https://github.com/kkos/oniguruma/commit/cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0>.
---

diff --git a/ext/mbstring/oniguruma/src/regcomp.c b/ext/mbstring/oniguruma/src/regcomp.c
index 69d4b95f95..4f68af2345 100644
--- a/ext/mbstring/oniguruma/src/regcomp.c
+++ b/ext/mbstring/oniguruma/src/regcomp.c
@@ -5603,7 +5603,7 @@ concat_opt_exact_str(OptStr* to, UChar* s, UChar* end, OnigEncoding enc)
 
   for (i = to->len, p = s; p < end && i < OPT_EXACT_MAXLEN; ) {
     len = enclen(enc, p);
-    if (i + len > OPT_EXACT_MAXLEN) break;
+    if (i + len >= OPT_EXACT_MAXLEN) break;
     for (j = 0; j < len && p < end; j++)
       to->s[i++] = *p++;
   }