diff options
| author | Sara Golemon <pollita@php.net> | 2017-10-07 10:14:03 -0400 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-10-07 10:14:03 -0400 |
| commit | 1db7e4a962782462e692f705ba6125dedfad87d5 (patch) | |
| tree | 53843be0fabdd594cd6cd1b990cf2dd40bf25576 /ext | |
| parent | ec3ea3081d46e59259f9bdedeb1b4de9498972ca (diff) | |
| parent | ac1fd769ad2c69f40007e5d679c6c61631eaec44 (diff) | |
| download | php-git-1db7e4a962782462e692f705ba6125dedfad87d5.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/streamsfuncs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 475fb060be..1c0c07b79b 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -330,7 +330,7 @@ PHP_FUNCTION(stream_socket_get_name) RETURN_FALSE; } - if (!ZSTR_LEN(name)) { + if ((ZSTR_LEN(name) == 0) || (ZSTR_VAL(name)[0] == 0)) { zend_string_release(name); RETURN_FALSE; } |