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.3' into PHP-8.4

Browse Source
This commit is contained in:
Yuya Hamada
2024-10-05 18:28:43 +09:00
parent 820037d0e0 4e23d3945a
commit f815310c98
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/mbstring/mbstring.c
View File

@@ -4607,7 +4607,7 @@ PHP_FUNCTION(mb_send_mail)
smart_str str = {0};
bool empty = true;
if (str_headers != NULL) {
if (str_headers != NULL && ZSTR_LEN(str_headers) > 0) {
/* Strip trailing CRLF from `str_headers`; we will add CRLF back if necessary */
size_t len = ZSTR_LEN(str_headers);
if (ZSTR_VAL(str_headers)[len-1] == '\n') {

26
ext/mbstring/tests/gh16229.phpt Normal file
View File

@@ -0,0 +1,26 @@
--TEST--
GH-16229 (Address overflowed in ext/mbstring/mbstring.c:4613 #16229)
--EXTENSIONS--
mbstring
--INI--
sendmail_path={MAIL:{PWD}/mb_send_mail_gh16229.eml}
mail.add_x_header=off
--SKIPIF--
<?php
if (!function_exists("mb_send_mail") || !mb_language("japanese")) {
die("skip mb_send_mail() not available");
}
?>
--FILE--
<?php
try {
$a = false;
mb_send_mail($a,$a,$a,$a,$a);
} catch (Exception $e) {
}
?>
--CLEAN--
<?php
@unlink(__DIR__ . "/mb_send_mail_gh16229.eml");
?>
--EXPECTF--