summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--ext/openssl/xp_ssl.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b57cd73929..4adf431aab 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,10 @@ PHP NEWS
. Fixed bug #78183 (finfo_file shows wrong mime-type for .tga file).
(Anatol)
+- Openssl:
+ . Fixed bug #78231 (Segmentation fault upon stream_socket_accept of exported
+ socket-to-stream). (Nikita)
+
- Opcache:
. Fixed #78202 (Opcache stats for cache hits are capped at 32bit NUM). (cmb)
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 6b96b2cb0f..3910bf815b 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -2383,7 +2383,8 @@ static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_
xparam->outputs.client = NULL;
- if ((tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay")) != NULL &&
+ if (PHP_STREAM_CONTEXT(stream) &&
+ (tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay")) != NULL &&
zend_is_true(tmpzval)) {
nodelay = 1;
}