Skip to content

Fix GH-16229: Address overflowed in mb_send_mail when empty string #16244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix GH-16229: Address overflowed in mb_send_mail when empty string #16244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/mbstring/mbstring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4346,7 +4346,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') {
Expand Down
26 changes: 26 additions & 0 deletions ext/mbstring/tests/gh16229.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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--
Loading