diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-05 15:34:50 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-05 15:34:50 +0400 |
| commit | 50d899dda3d225c962fec1b8cce1cb880c84999e (patch) | |
| tree | 40e0d4c71bf8d1070f4e0561d36920f9f571fff5 /ext/standard/streamsfuncs.c | |
| parent | b763baff97b85cead7b6a3cbf904826fb9bb8d16 (diff) | |
| parent | ef01b7937e334ab454a1ea9b1704d6f981bef801 (diff) | |
| download | php-git-50d899dda3d225c962fec1b8cce1cb880c84999e.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'ext/standard/streamsfuncs.c')
| -rw-r--r-- | ext/standard/streamsfuncs.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); } |