diff options
| author | Sara Golemon <pollita@php.net> | 2017-05-28 08:49:25 -0700 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-05-28 08:49:25 -0700 |
| commit | e628ee9e9db1e7fc471159ab2479a8bfd85e122d (patch) | |
| tree | 2c31157b4ca44c9229e3a049fe754d7cc56ec36f /ext/standard/streamsfuncs.c | |
| parent | d9458aac9d3f932e9b0da4d099d645d7e74ac4e2 (diff) | |
| parent | 8dcfec9789b4792f7b6b25673274b74bae71b512 (diff) | |
| download | php-git-e628ee9e9db1e7fc471159ab2479a8bfd85e122d.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bugfix #74556 stream_socket_get_name() returns empty string
Fix abstract name handling to be binary safe
Diffstat (limited to 'ext/standard/streamsfuncs.c')
| -rw-r--r-- | ext/standard/streamsfuncs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index feb9346885..9c2f8f6d58 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -314,6 +314,11 @@ PHP_FUNCTION(stream_socket_get_name) RETURN_FALSE; } + if (!ZSTR_LEN(name)) { + zend_string_release(name); + RETURN_FALSE; + } + RETVAL_STR(name); } /* }}} */ |