php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source
This commit is contained in:
David Carlier
2024-10-11 08:49:19 +01:00
parent 5bb987b3a3 f47a45ecff
commit 0323fffd4b
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ext/mbstring/mbstring.c
View File

@@ -2326,6 +2326,16 @@ PHP_FUNCTION(mb_substr)
Z_PARAM_STR_OR_NULL(encoding)
ZEND_PARSE_PARAMETERS_END();
if (from == ZEND_LONG_MIN) {
zend_argument_value_error(2, "must be between " ZEND_LONG_FMT " and " ZEND_LONG_FMT, (ZEND_LONG_MIN + 1), ZEND_LONG_MAX);
RETURN_THROWS();
}
if (!len_is_null && len == ZEND_LONG_MIN) {
zend_argument_value_error(3, "must be between " ZEND_LONG_FMT " and " ZEND_LONG_FMT, (ZEND_LONG_MIN + 1), ZEND_LONG_MAX);
RETURN_THROWS();
}
const mbfl_encoding *enc = php_mb_get_encoding(encoding, 4);
if (!enc) {
RETURN_THROWS();

23
ext/mbstring/tests/gh16360.phpt Normal file
View File

@@ -0,0 +1,23 @@
--TEST--
GH-16320 mb_substr overflow from negative length
--EXTENSIONS--
mbstring
--FILE--
<?php
try {
mb_substr("abcd", PHP_INT_MIN, 4, "UTF-8");
} catch (\ValueError $e) {
echo $e->getMessage() . PHP_EOL;
}
try {
mb_substr("abcd", 0, PHP_INT_MIN, "UTF-8");
} catch (\ValueError $e) {
echo $e->getMessage() . PHP_EOL;
}
var_dump(mb_substr("abcd", PHP_INT_MAX, PHP_INT_MAX, "UTF-8"));
?>
--EXPECTF--
mb_substr(): Argument #2 ($start) must be between %s and %s
mb_substr(): Argument #3 ($length) must be between %s and %s
string(0) ""