Skip to content

Fix NULL deref when enabling TLS fails and the peer name needs to be reset #21031

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

Open
ndossche wants to merge 2 commits into
base: PHP-8.4
Choose a base branch
from
Open

Fix NULL deref when enabling TLS fails and the peer name needs to be reset #21031

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
008e841
Fix NULL deref when enabling TLS fails and the peer name needs to be …
ndossche Jan 24, 2026
ef2c18a
Also do the unset here
ndossche Jan 24, 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
12 changes: 9 additions & 3 deletions ext/standard/http_fopen_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,10 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
smart_str_appendl(&header, "\r\n", sizeof("\r\n")-1);

if (php_stream_write(stream, ZSTR_VAL(header.s), ZSTR_LEN(header.s)) != ZSTR_LEN(header.s)) {
if (reset_ssl_peer_name) {
php_stream_context_unset_option(PHP_STREAM_CONTEXT(stream), "ssl", "peer_name");
}

php_stream_wrapper_log_error(wrapper, options, "Cannot connect to HTTPS server through proxy");
php_stream_close(stream);
stream = NULL;
Expand All @@ -561,16 +565,18 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,

/* enable SSL transport layer */
if (stream) {
php_stream_context *old_context = PHP_STREAM_CONTEXT(stream);

if (php_stream_xport_crypto_setup(stream, STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL) < 0 ||
php_stream_xport_crypto_enable(stream, 1) < 0) {
php_stream_wrapper_log_error(wrapper, options, "Cannot connect to HTTPS server through proxy");
php_stream_close(stream);
stream = NULL;
}
}

if (reset_ssl_peer_name) {
php_stream_context_unset_option(PHP_STREAM_CONTEXT(stream), "ssl", "peer_name");
if (reset_ssl_peer_name) {
php_stream_context_unset_option(old_context, "ssl", "peer_name");
}
}
}

Expand Down
Loading