com php-src: Fix #78633: Heap buffer overflow (read) in mb_eregi: NEWS ext/mbstring/oniguruma/src/regcomp.c ext/mbstring/oniguruma/src/regexec.c
ext/mbstring/tests/ bug78633.phpt
| From: | Christoph Michael Becker | Date: | Tue, 22 Oct 2019 07:12:53 +0000 |
| Subject: | com php-src: Fix #78633: Heap buffer overflow (read) in mb_eregi: NEWS ext/mbstring/oniguruma/src/regcomp.c ext/mbstring/oniguruma/src/regexec.c ext/mbstring/tests/ bug78633.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-108988@lists.php.net to get a copy of this message | ||
Commit: 126018250ecb53e5126c67175fd5077ff03e8022
Author: Christoph M. Becker <cmbecker69@gmx.de> Fri, 4 Oct 2019 19:02:37 +0200
Parents: 19e17d3807e6cc0b1ba9443ec5facbd33a61f8fe
Branches: PHP-7.3.11
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=126018250ecb53e5126c67175fd5077ff03e8022
Log:
Fix #78633: Heap buffer overflow (read) in mb_eregi
We backport kkos/oniguruma@15c4228aa2ffa02140a99912dd3177df0b1841c6.
(cherry picked from commit 4f50d58caba8286b5c533f6925b2ec320dd0742e)
Bugs:
https://bugs.php.net/78633
Changed paths:
M NEWS
M ext/mbstring/oniguruma/src/regcomp.c
M ext/mbstring/oniguruma/src/regexec.c
A ext/mbstring/tests/bug78633.phpt
Diff:
diff --git a/NEWS b/NEWS
index c8e83940c94..f6aa9f2092b 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ PHP NEWS
fastcgi_finish_request). (Sergei Turchanov)
- MBString:
+ . Fixed bug #78633 (Heap buffer overflow (read) in mb_eregi). (cmb)
. Fixed bug #78579 (mb_decode_numericentity: args number inconsistency).
(cmb)
. Fixed bug #78609 (mb_check_encoding() no longer supports stringable
diff --git a/ext/mbstring/oniguruma/src/regcomp.c b/ext/mbstring/oniguruma/src/regcomp.c
index d1fbd1376e6..e91bdec206f 100644
--- a/ext/mbstring/oniguruma/src/regcomp.c
+++ b/ext/mbstring/oniguruma/src/regcomp.c
@@ -724,8 +724,8 @@ add_compile_string(UChar* s, int mb_len, int str_len,
COP(reg)->exact_n.s = p;
}
else {
+ xmemset(COP(reg)->exact.s, 0, sizeof(COP(reg)->exact.s));
xmemcpy(COP(reg)->exact.s, s, (size_t )byte_len);
- COP(reg)->exact.s[byte_len] = '\0';
}
return 0;
diff --git a/ext/mbstring/oniguruma/src/regexec.c b/ext/mbstring/oniguruma/src/regexec.c
index 32c750b1f1e..a4809baf5d1 100644
--- a/ext/mbstring/oniguruma/src/regexec.c
+++ b/ext/mbstring/oniguruma/src/regexec..c
@@ -2900,6 +2900,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
DATA_ENSURE(0);
q = lowbuf;
while (len-- > 0) {
+ if (ps >= endp) goto fail;
if (*ps != *q) goto fail;
ps++; q++;
}
diff --git a/ext/mbstring/tests/bug78633.phpt b/ext/mbstring/tests/bug78633.phpt
new file mode 100644
index 00000000000..3ff69a1867e
--- /dev/null
+++ b/ext/mbstring/tests/bug78633.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Bug #78633 (Heap buffer overflow (read) in mb_eregi)
+--SKIPIF--
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not
available');
+if (!function_exists('mb_eregi')) die('skip mb_eregi function not available');
+?>
+--FILE--
+<?php
+var_dump(mb_eregi("..+Isssǰ", ".+Isssǰ"));
+?>
+--EXPECT--
+bool(false)