From 1f4990299927a9fdf24676ebbd1c7f6729aa3838 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?= Date: Tue, 1 Feb 2011 22:55:17 +0000 Subject: [PATCH] - Fixed bug #53903 (userspace stream stat callback does not separate the elements of the returned array before converting them). --- ext/standard/tests/streams/bug53903.phpt | 32 ++++++++++++++++++++++++ main/streams/userspace.c | 1 + 2 files changed, 33 insertions(+) create mode 100644 ext/standard/tests/streams/bug53903.phpt diff --git a/ext/standard/tests/streams/bug53903.phpt b/ext/standard/tests/streams/bug53903.phpt new file mode 100644 index 0000000000..3b61635d78 --- /dev/null +++ b/ext/standard/tests/streams/bug53903.phpt @@ -0,0 +1,32 @@ +--TEST-- +Bug #53903 streamwrapper/stream_stat causes problems +--FILE-- + $this->undefined, + ); + } + +} +stream_wrapper_register('sx', 'sw') or die('failed'); + +fstat(fopen('sx://test', 'r')); + +$s[] = 1; // Cannot use a scalar value as an array + +print_r($s); +--EXPECTF-- +Notice: Undefined property: sw::$undefined in %s on line %d +Array +( + [0] => 1 +) + diff --git a/main/streams/userspace.c b/main/streams/userspace.c index ce9a0afce4..49c3c662ae 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -855,6 +855,7 @@ static int statbuf_from_array(zval *array, php_stream_statbuf *ssb TSRMLS_DC) #define STAT_PROP_ENTRY_EX(name, name2) \ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(array), #name, sizeof(#name), (void**)&elem)) { \ + SEPARATE_ZVAL(elem); \ convert_to_long(*elem); \ ssb->sb.st_##name2 = Z_LVAL_PP(elem); \ } -- 2.50.1