From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 5 Mar 2014 08:03:05 +0000 (+0800)
Subject: Fixed memory leak (ext/standard/tests/file/stream_002.phpt)
X-Git-Tag: POST_PHPNG_MERGE~412^2~417^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb5e9eac9fa56978f1eb75939c19a253d3a7a6ab;p=php

Fixed memory leak (ext/standard/tests/file/stream_002.phpt)
---

diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 39c0d17bc2..8dfd08a347 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -120,10 +120,12 @@ PHP_FUNCTION(stream_socket_client)
 	tv.tv_usec = conv % 1000000;
 #endif
 	if (zerrno)	{
+		zerrno = Z_REFVAL_P(zerrno);
 		zval_dtor(zerrno);
 		ZVAL_LONG(zerrno, 0);
 	}
 	if (zerrstr) {
+		zerrstr = Z_REFVAL_P(zerrstr);
 		zval_dtor(zerrstr);
 		ZVAL_EMPTY_STRING(zerrstr);
 	}
@@ -156,6 +158,7 @@ PHP_FUNCTION(stream_socket_client)
 			zval_dtor(zerrstr);
 //???			ZVAL_STRING(zerrstr, errstr, 0);
 			ZVAL_STRING(zerrstr, errstr);
+			efree(errstr);
 		} else if (errstr) {
 			efree(errstr);
 		}