lbarnaud Sun Oct 5 01:40:38 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/filters bug46164-1.phpt bug46164-2.phpt
Modified files:
/php-src NEWS
/php-src/ext/standard user_filters.c
Log:
MFH: Fixed #46164 (stream_filter_remove() closes the stream)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1240&r2=1.2027.2.547.2.1241&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1240 php-src/NEWS:1.2027.2.547.2.1241
--- php-src/NEWS:1.2027.2.547.2.1240 Sat Oct 4 13:19:21 2008
+++ php-src/NEWS Sun Oct 5 01:40:38 2008
@@ -21,6 +21,7 @@
- Fixed bug #46215 (json_encode mutates its parameter and has some
class-specific state). (Felipe)
- Fixed bug #46191 (BC break: DOMDocument saveXML() doesn't accept null). (Rob)
+- Fixed bug #46164 (stream_filter_remove() closes the stream). (Arnaud)
- Fixed bug #46157 (PDOStatement::fetchObject prototype error). (Felipe)
- Fixed bug #46147 (after stream seek, appending stream filter reads
incorrect data). (Greg)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.31.2.4.2.10&r2=1.31.2.4.2.11&diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.31.2.4.2.10
php-src/ext/standard/user_filters.c:1.31.2.4.2.11
--- php-src/ext/standard/user_filters.c:1.31.2.4.2.10 Mon Dec 31 07:20:13 2007
+++ php-src/ext/standard/user_filters.c Sun Oct 5 01:40:38 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: user_filters.c,v 1.31.2.4.2.10 2007/12/31 07:20:13 sebastian Exp $ */
+/* $Id: user_filters.c,v 1.31.2.4.2.11 2008/10/05 01:40:38 lbarnaud Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -180,12 +180,14 @@
zval *retval = NULL;
zval **args[4];
zval *zclosing, *zconsumed, *zin, *zout, *zstream;
+ zval zpropname;
int call_result;
if (FAILURE == zend_hash_find(Z_OBJPROP_P(obj), "stream",
sizeof("stream"), (void**)&zstream)) {
/* Give the userfilter class a hook back to the stream */
ALLOC_INIT_ZVAL(zstream);
php_stream_to_zval(stream, zstream);
+ zval_copy_ctor(zstream);
add_property_zval(obj, "stream", zstream);
/* add_property_zval increments the refcount which is unwanted
here */
zval_ptr_dtor(&zstream);
@@ -247,6 +249,13 @@
}
}
+ /* filter resources are cleaned up by the stream destructor,
+ * keeping a reference to the stream resource here would prevent it
+ * from being destroyed properly */
+ INIT_ZVAL(zpropname);
+ ZVAL_STRINGL(&zpropname, "stream", sizeof("stream")-1, 0);
+ Z_OBJ_HANDLER_P(obj, unset_property)(obj, &zpropname TSRMLS_CC);
+
zval_ptr_dtor(&zclosing);
zval_ptr_dtor(&zconsumed);
zval_ptr_dtor(&zout);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/bug46164-1.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/filters/bug46164-1.phpt
+++ php-src/ext/standard/tests/filters/bug46164-1.phpt
--TEST--
Bug #46164 - 1 (stream_filter_remove() closes the stream)
--FILE--
<?php
class user_filter extends php_user_filter {
function filter($in, $out, &$consumed, $closing) {
while($bucket = stream_bucket_make_writeable($in)) {
$consumed += $bucket->datalen;
stream_bucket_append($out, $bucket);
}
return PSFS_PASS_ON;
}
}
stream_filter_register('user_filter','user_filter');
$fd = fopen('php://memory','w');
$filter = stream_filter_append($fd, 'user_filter');
stream_filter_remove($filter);
var_dump(fclose($fd));
?>
--EXPECT--
bool(true)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/bug46164-2.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/filters/bug46164-2.phpt
+++ php-src/ext/standard/tests/filters/bug46164-2.phpt
--TEST--
Bug #46164 - 2 (stream_filter_remove() closes the stream)
--FILE--
<?php
class user_filter extends php_user_filter {
function filter($in, $out, &$consumed, $closing) {
while($bucket = stream_bucket_make_writeable($in)) {
$consumed += $bucket->datalen;
stream_bucket_append($out, $bucket);
}
unset($this->stream);
return PSFS_PASS_ON;
}
}
stream_filter_register('user_filter','user_filter');
$fd = fopen('php://memory','w');
$filter = stream_filter_append($fd, 'user_filter');
fwrite($fd, b"foo");
fflush($fd);
var_dump(fclose($fd));
?>
--EXPECT--
bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
