MFH: Fixed #46164 (stream_filter_remove() closes the stream)

diff --git a/NEWS b/NEWS
index e25d84d3a060c3dae3c68886fc4386648b72c205..fa661b9756180a8aa76fa3790a2ef9a9d939f465 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@ PHP                                                                        NEWS
 - 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)

diff --git a/ext/standard/tests/filters/bug46164-1.phpt b/ext/standard/tests/filters/bug46164-1.phpt
new file mode 100644 (file)
index 0000000..b2d2d4e
--- /dev/null
+++ b/ext/standard/tests/filters/bug46164-1.phpt
@@ -0,0 +1,22 @@
+--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)

diff --git a/ext/standard/tests/filters/bug46164-2.phpt b/ext/standard/tests/filters/bug46164-2.phpt
new file mode 100644 (file)
index 0000000..6a1bde5
--- /dev/null
+++ b/ext/standard/tests/filters/bug46164-2.phpt
@@ -0,0 +1,24 @@
+--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, "foo");
+fflush($fd);
+var_dump(fclose($fd));
+?>
+--EXPECT--
+bool(true)

diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 9f4ef7f135e73cb2747e093596914f7d8469969b..659c090a8349b59dcc00841b88cebeff93acb0f6 100644 (file)
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -180,12 +180,14 @@ php_stream_filter_status_t userfilter_filter(
        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 @@ php_stream_filter_status_t userfilter_filter(
                }
        }
 
+       /* 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);