Merge branch 'PHP-7.2'

* PHP-7.2:
  Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
  Add line numbers to Optimizer debug output
This commit is contained in:
Sara Golemon 2017-10-07 10:14:11 -04:00
commit e66e2731b8

View File

@ -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;
}