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.5'

Browse Source 
* PHP-8.5:
  Fix GH-20833: mb_str_pad() divide by zero if padding string is invalid in the encoding
This commit is contained in:
Niels Dossche
2026-01-05 20:01:59 +01:00
parent 988d29b4db 171b52c98f
commit e4098da58a
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/mbstring/mbstring.c
View File

@@ -5856,6 +5856,11 @@ PHP_FUNCTION(mb_str_pad)
}
size_t pad_length = mb_get_strlen(pad, encoding);
if (pad_length == 0) {
/* Possible with invalidly encoded padding string. */
zend_argument_must_not_be_empty_error(3);
RETURN_THROWS();
}
size_t num_mb_pad_chars = pad_to_length - input_length;

16
ext/mbstring/tests/gh20833.phpt Normal file
View File

@@ -0,0 +1,16 @@
--TEST--
GH-20833 (mb_str_pad() divide by zero if padding string is invalid in the encoding)
--EXTENSIONS--
mbstring
--FILE--
<?php
$utf8 = "test";
$utf32 = mb_convert_encoding($utf8, 'UTF-32', 'UTF-8');
try {
mb_str_pad($utf32, 5, "1" /* invalid for encoding */, STR_PAD_RIGHT, "UTF-32");
} catch (ValueError $e) {
echo $e::class, ": ", $e->getMessage(), "\n";
}
?>
--EXPECT--
ValueError: mb_str_pad(): Argument #3 ($pad_string) must not be empty