diff options
| author | Sara Golemon <pollita@php.net> | 2017-10-07 10:13:54 -0400 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-10-07 10:13:54 -0400 |
| commit | ac1fd769ad2c69f40007e5d679c6c61631eaec44 (patch) | |
| tree | a43e5f9ff2a7b8d1ffae33f7630c2aa447bb0861 | |
| parent | 0f551385330b0b9709ffca83a87e3ed03706b37d (diff) | |
| parent | 843e492c6816fa18eff83a7a3e8c370531796912 (diff) | |
| download | php-git-ac1fd769ad2c69f40007e5d679c6c61631eaec44.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
| -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 9c2f8f6d58..ba3387d7ce 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -314,7 +314,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; } |