diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-07-03 23:57:42 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-07-03 23:57:42 +0800 |
| commit | f6aaaf02a9ab0153026a87a773f94fd38dc332ba (patch) | |
| tree | fc9783d4902ecbdbf0e52d5d11b27b6f0301ba8c | |
| parent | 612aff3a8a42bb5ef756e60769b16f9879c7f036 (diff) | |
| parent | b90c2fc7b990e8d1e308ba0a88c2978d405c128d (diff) | |
| download | php-git-f6aaaf02a9ab0153026a87a773f94fd38dc332ba.tar.gz | |
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
update NEWS
extend test
Fixed bug #72534 stream_socket_get_name crashes
| -rw-r--r-- | ext/standard/streamsfuncs.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/streams/bug72534.phpt | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 0e5d0ce79e..971bfed3b1 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -322,7 +322,7 @@ PHP_FUNCTION(stream_socket_get_name) if (0 != php_stream_xport_get_name(stream, want_peer, &name, NULL, NULL - )) { + ) || !name) { RETURN_FALSE; } diff --git a/ext/standard/tests/streams/bug72534.phpt b/ext/standard/tests/streams/bug72534.phpt new file mode 100644 index 0000000000..38e1208a37 --- /dev/null +++ b/ext/standard/tests/streams/bug72534.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #72534 stream_socket_get_name crashes +--FILE-- +<?php +$fname = dirname(__FILE__) . '/aa.tmp'; +$fp0 = fopen($fname, 'w'); +var_dump(stream_socket_get_name($fp0, false)); +var_dump(stream_socket_get_name($fp0, true)); +fclose($fp0); +?> +--CLEAN-- +<?php +$fname = dirname(__FILE__) . '/aa.tmp'; +unlink($fname); +?> +--EXPECT-- +bool(false) +bool(false) + |