com php-src: Fix #66797: mb_substr only takes 32-bi t signed integer: NEWS ext/mbstring/mbstring.c ex t/mbstring/tests/bug66797.phpt
| From: | Christoph Michael Becker | Date: | Tue, 30 Aug 2016 12:52:47 +0000 |
| Subject: | com php-src: Fix #66797: mb_substr only takes 32-bi t signed integer: NEWS ext/mbstring/mbstring.c ex t/mbstring/tests/bug66797.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94163@lists.php.net to get a copy of this message | ||
Commit: 2f10db36af2776f386b7433c5cbfe79e66edd14d
Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 30 Aug 2016 14:48:24 +0200
Parents: af7828a20f085c6cd2b720b093ee08f299505257
Branches: PHP-5.6 PHP-7..0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2f10db36af2776f386b7433c5cbfe79e66edd14d
Log:
Fix #66797: mb_substr only takes 32-bit signed integer
from and len are long, but get passed to mbfl_substr() which
expects
ints. Therefore we clamp the values to avoid the undefined conversion
behavior.
Bugs:
https://bugs.php.net/66797
Changed paths:
M NEWS
M ext/mbstring/mbstring.c
A ext/mbstring/tests/bug66797.phpt
Diff:
diff --git a/NEWS b/NEWS
index a05fa84..531d626 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,9 @@ PHP NEWS
- JSON:
. Fixed bug #72787 (json_decode reads out of bounds). (Jakub Zelenka)
+- mbstring:
+ . Fixed bug #66797 (mb_substr only takes 32-bit signed integer). (cmb)
+
- MSSQL:
. Fixed bug #72039 (Use of uninitialised value on mssql_guid_string). (Kalle)
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 1cfaf2c..ee8a009 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2799,6 +2799,13 @@ PHP_FUNCTION(mb_substr)
RETURN_FALSE;
}
+ if (from > INT_MAX) {
+ from = INT_MAX;
+ }
+ if (len > INT_MAX) {
+ len = INT_MAX;
+ }
+
ret = mbfl_substr(&string, &result, from, len);
if (NULL == ret) {
RETURN_FALSE;
diff --git a/ext/mbstring/tests/bug66797.phpt b/ext/mbstring/tests/bug66797.phpt
new file mode 100644
index 0000000..df9e789
--- /dev/null
+++ b/ext/mbstring/tests/bug66797.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Bug #66797 (mb_substr only takes 32-bit signed integer)
+--SKIPIF--
+<?php
+if (!extension_loaded('mbstring')) die('skip mbstring extension not
available');
+if (PHP_INT_SIZE != 8) die('skip this test is for 64bit platforms only');
+?>
+--FILE--
+<?php
+var_dump(
+ mb_substr('bar', 0, 0x7fffffff),
+ mb_substr('bar', 0, 0x80000000),
+ mb_substr('bar', 0xffffffff, 1),
+ mb_substr('bar', 0x100000000, 1)
+);
+?>
+==DONE==
+--EXPECTF--
+string(3) "bar"
+string(3) "bar"
+string(0) ""
+string(0) ""
+==DONE==