Skip to content

Commit 0e48e35

Browse files
committed
Fixed bug #78231
1 parent 44c8b74 commit 0e48e35

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ PHP NEWS
1717
- Date:
1818
. Fixed #69044 (discrepency between time and microtime). (krakjoe)
1919

20+
- Openssl:
21+
. Fixed bug #78231 (Segmentation fault upon stream_socket_accept of exported
22+
socket-to-stream). (Nikita)
23+
2024
- OPcache:
2125
. Fixed #78189 (file cache strips last character of uname hash). (cmb)
2226
. Fixed #78202 (Opcache stats for cache hits are capped at 32bit NUM). (cmb)

ext/openssl/xp_ssl.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2274,7 +2274,8 @@ static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_
22742274

22752275
xparam->outputs.client = NULL;
22762276

2277-
if ((tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay")) != NULL &&
2277+
if (PHP_STREAM_CONTEXT(stream) &&
2278+
(tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay")) != NULL &&
22782279
zend_is_true(tmpzval)) {
22792280
nodelay = 1;
22802281
}

0 commit comments

Comments
 (0)