Skip to content

Fix GH-10990: mail() throws TypeError after iterating over $additional_headers array by reference #10991

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-10990: mail() throws TypeError after iterating over $additional_headers array by reference #10991

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: 2 additions & 0 deletions ext/standard/mail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ static void php_mail_build_headers_elems(smart_str *s, zend_string *key, zval *v
zend_type_error("Header \"%s\" must only contain numeric keys, \"%s\" found", ZSTR_VAL(key), ZSTR_VAL(tmp_key));
break;
}
ZVAL_DEREF(tmp_val);
if (Z_TYPE_P(tmp_val) != IS_STRING) {
zend_type_error("Header \"%s\" must only contain values of type string, %s found", ZSTR_VAL(key), zend_zval_type_name(tmp_val));
break;
Expand All @@ -157,6 +158,7 @@ PHPAPI zend_string *php_mail_build_headers(HashTable *headers)
zend_type_error("Header name cannot be numeric, " ZEND_LONG_FMT " given", idx);
break;
}
ZVAL_DEREF(val);
/* https://tools.ietf.org/html/rfc2822#section-3.6 */
if (zend_string_equals_literal_ci(key, "orig-date")) {
PHP_MAIL_BUILD_HEADER_CHECK("orig-date", s, key, val);
Expand Down
17 changes: 17 additions & 0 deletions ext/standard/tests/mail/gh10990.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
--TEST--
GH-10990 (mail() throws TypeError after iterating over $additional_headers array by reference)
--INI--
sendmail_path=rubbish 2>/dev/null
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) == "WIN")
die("skip Won't run on Windows");
?>
--FILE--
<?php
$from = '[email protected]';
$headers = ['From' => &$from];
var_dump(mail('[email protected]', 'Test', 'Test', $headers));
?>
--EXPECT--
bool(false)