diff options
| author | Sara Golemon <pollita@php.net> | 2017-05-28 08:51:41 -0700 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-05-28 08:51:41 -0700 |
| commit | e60cedfbc30c295dac16be1fe357f5ce29ff8605 (patch) | |
| tree | 0b6c4aff7743ac6a7e260a0499d299cb7a827097 /ext/standard/streamsfuncs.c | |
| parent | 818272ae10d00c6ac63116e5b3d71f6d3578fb2b (diff) | |
| parent | e628ee9e9db1e7fc471159ab2479a8bfd85e122d (diff) | |
| download | php-git-e60cedfbc30c295dac16be1fe357f5ce29ff8605.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
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 e243ce9324..783b354984 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -330,6 +330,11 @@ PHP_FUNCTION(stream_socket_get_name) RETURN_FALSE; } + if (!ZSTR_LEN(name)) { + zend_string_release(name); + RETURN_FALSE; + } + RETVAL_STR(name); } /* }}} */ |