Skip to content

fix null pointer dereference in php_mail_detect_multiple_crlf via error_log #20862

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
jordikroon wants to merge 2 commits into from
Closed

fix null pointer dereference in php_mail_detect_multiple_crlf via error_log #20862

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51cc3dd
fix null pointer dereference in php_mail_detect_multiple_crlf via err…
jordikroon Jan 7, 2026
bb6d344
validate email recipient in error_log before passing to php_mail and …
jordikroon Jan 8, 2026
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
8 changes: 7 additions & 1 deletion ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1350,10 +1350,16 @@ PHPAPI zend_result _php_error_log(int opt_err, const zend_string *message, const
php_stream *stream = NULL;
size_t nbytes;

const char *to = NULL;
const char *hdrs = NULL;

switch (opt_err)
{
case 1: /*send an email */
if (!php_mail(ZSTR_VAL(opt), "PHP error_log message", ZSTR_VAL(message), ZSTR_VAL(headers), NULL)) {
to = opt ? ZSTR_VAL(opt) : NULL;
Comment thread
jordikroon marked this conversation as resolved.
Outdated
Comment thread
jordikroon marked this conversation as resolved.
Outdated
hdrs = headers ? ZSTR_VAL(headers) : NULL;

if (!php_mail(to, "PHP error_log message", ZSTR_VAL(message), hdrs, NULL)) {
return FAILURE;
}
break;
Expand Down
35 changes: 35 additions & 0 deletions tests/basic/gh20858.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
--TEST--
GH-20858 Null pointer dereference in php_mail_detect_multiple_crlf via error_log
--INI--
sendmail_path="cat > /tmp/php_test_gh20878.out"
Comment thread
jordikroon marked this conversation as resolved.
Outdated
mail.force_extra_parameters="-n"
mail.add_x_header = Off
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) == "WIN")
die("skip Won't run on Windows");
?>
--FILE--
<?php

$headers = "From: test <mail@domain.tld>\n";
$headers .= "Cc: test <mail@domain.tld>\n";
$headers .= 'X-Mailer: PHP/' . phpversion();

// Send mail with nothing set
var_dump(error_log("Error message", 1, null));

// Send mail with destination set
var_dump(error_log("Error message with dest", 1, "default@domain.tld>", null));
Comment thread
jordikroon marked this conversation as resolved.
Outdated

// Send mail with custom headers
var_dump(error_log("Error message cust headers", 1, null, $headers));

// Send mail with destination set + custom headers
var_dump(error_log("Error message with both", 1, "default@domain.tld>", $headers));
?>
Comment thread
jordikroon marked this conversation as resolved.
--EXPECTF--
Copy link
Copy Markdown
Member

@iluuu1994 iluuu1994 Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: F may be dropped

bool(true)
bool(true)
bool(true)
bool(true)
Loading