From ea9da7529c1a94a81cee234ba24ad0117cd108d6 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Sun, 3 Jul 2016 17:09:19 +0200
Subject: Fixed bug #72534 stream_socket_get_name crashes

---
 ext/standard/streamsfuncs.c              |  2 +-
 ext/standard/tests/streams/bug72534.phpt | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 ext/standard/tests/streams/bug72534.phpt

diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 0e5d0ce79e..971bfed3b1 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -322,7 +322,7 @@ PHP_FUNCTION(stream_socket_get_name)
 	if (0 != php_stream_xport_get_name(stream, want_peer,
 				&name,
 				NULL, NULL
-				)) {
+				) || !name) {
 		RETURN_FALSE;
 	}
 
diff --git a/ext/standard/tests/streams/bug72534.phpt b/ext/standard/tests/streams/bug72534.phpt
new file mode 100644
index 0000000000..f33be8b06e
--- /dev/null
+++ b/ext/standard/tests/streams/bug72534.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Bug #72534 stream_socket_get_name crashes
+--FILE--
+<?php
+$fname = dirname(__FILE__) . '/aa.tmp';
+$fp0 = fopen($fname, 'w');
+var_dump(stream_socket_get_name($fp0,false)); 
+fclose($fp0);
+?>
+--CLEAN--
+<?php
+$fname = dirname(__FILE__) . '/aa.tmp';
+unlink($fname);
+?>
+--EXPECT--
+bool(false)
-- 
cgit v1.2.1


From 8b229bfeeb8ae959d08fecf1a246e74d8863e5e4 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Sun, 3 Jul 2016 17:13:46 +0200
Subject: extend test

---
 ext/standard/tests/streams/bug72534.phpt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/standard/tests/streams/bug72534.phpt b/ext/standard/tests/streams/bug72534.phpt
index f33be8b06e..38e1208a37 100644
--- a/ext/standard/tests/streams/bug72534.phpt
+++ b/ext/standard/tests/streams/bug72534.phpt
@@ -4,7 +4,8 @@ Bug #72534 stream_socket_get_name crashes
 <?php
 $fname = dirname(__FILE__) . '/aa.tmp';
 $fp0 = fopen($fname, 'w');
-var_dump(stream_socket_get_name($fp0,false)); 
+var_dump(stream_socket_get_name($fp0, false));
+var_dump(stream_socket_get_name($fp0, true));
 fclose($fp0);
 ?>
 --CLEAN--
@@ -14,3 +15,5 @@ unlink($fname);
 ?>
 --EXPECT--
 bool(false)
+bool(false)
+
-- 
cgit v1.2.1


From b90c2fc7b990e8d1e308ba0a88c2978d405c128d Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Sun, 3 Jul 2016 17:15:19 +0200
Subject: update NEWS

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index 3e2be90c56..02da714031 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,7 @@ PHP                                                                        NEWS
 - Streams:
   . Fixed bug #72439 (Stream socket with remote address leads to a segmentation
     fault). (Laruence)
+  . Fixed bug #72534 (stream_socket_get_name crashes). (Anatol)
 
 23 Jun 2016 PHP 7.0.8
 
-- 
cgit v1.2.1