Fixed bug #78231

diff --git a/NEWS b/NEWS
index 4c05f42773c05d4fe92c1c9cfbd5e47e927b0767..c0fb40bb8a9ed4a945347ff8caacdbf137682c65 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,10 @@ PHP                                                                        NEWS
 - Date:
   . Fixed #69044 (discrepency between time and microtime). (krakjoe)
 
+- Openssl:
+  . Fixed bug #78231 (Segmentation fault upon stream_socket_accept of exported
+    socket-to-stream). (Nikita)
+
 - OPcache:
   . Fixed #78189 (file cache strips last character of uname hash). (cmb)
   . 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 c8e5692bbe0e1fa6d89e8d1bdc92ab57523167ba..3df1a1889a294b7cad587631b098f89d4f27731a 100644 (file)
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -2274,7 +2274,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;
        }