From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 3 Jul 2019 10:27:13 +0000 (+0200)
Subject: Fixed bug #78231
X-Git-Tag: php-7.2.21RC1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e48e35e0485bc6d6458a45ecab5b19a0c2ec001;p=php

Fixed bug #78231
---

diff --git a/NEWS b/NEWS
index 4c05f42773..c0fb40bb8a 100644
--- 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 c8e5692bbe..3df1a1889a 100644
--- 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;
 	}