From 02b271b351214ad15b40323ad073081225c9a4c4 Mon Sep 17 00:00:00 2001
From: NickSdot <catch.github.com.nicksdot@nicksdot.dev>
Date: Tue, 25 Aug 2026 00:18:57 +0700
Subject: [PATCH] tests: filter bucket leaks skip/warn

---
 ...er_class_coerce_consumed_by_ref_param.phpt | 27 ++++++-
 ...eam_filter_register_mock_class_filter.phpt | 27 ++++++-
 ...m_filter_register_unprocessed_buckets.phpt | 80 +++++++++++++++++++
 ...egister_unprocessed_buckets_reentrant.phpt | 68 ++++++++++++++++
 4 files changed, 198 insertions(+), 4 deletions(-)
 create mode 100644 ext/standard/tests/filters/stream_filter_register_unprocessed_buckets.phpt
 create mode 100644 ext/standard/tests/filters/stream_filter_register_unprocessed_buckets_reentrant.phpt

diff --git a/ext/standard/tests/filters/stream_filter_register_class_coerce_consumed_by_ref_param.phpt b/ext/standard/tests/filters/stream_filter_register_class_coerce_consumed_by_ref_param.phpt
index f5f0ecca7975..78932a132ef3 100644
--- a/ext/standard/tests/filters/stream_filter_register_class_coerce_consumed_by_ref_param.phpt
+++ b/ext/standard/tests/filters/stream_filter_register_class_coerce_consumed_by_ref_param.phpt
@@ -1,7 +1,30 @@
 --TEST--
 stream_filter_register() with a class that coerces the $consumed parameter of filter method
---XFAIL--
-This leaks memory
+--SKIPIF--
+<?php
+
+// this leaks memory
+// remove SKIPIF section when GH-20058 is merged OR when debug
+// builds report "warn: XFAIL section but test passes"
+
+if (getenv('SKIP_MSAN')) {
+	die('skip requires a leak detector');
+}
+
+if (getenv('SKIP_ASAN') && PHP_OS_FAMILY !== 'Windows') {
+	die('xfail User filters leak unprocessed buckets');
+}
+
+if (PHP_DEBUG && getenv('USE_ZEND_ALLOC') !== '0') {
+	die('xfail User filters leak unprocessed buckets');
+}
+
+if (getenv('USE_ZEND_ALLOC') === '0' && getenv('ZEND_DONT_UNLOAD_MODULES') === '1') {
+	die('xleak User filters leak unprocessed buckets');
+}
+
+die('skip requires a leak detector');
+?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/filters/stream_filter_register_mock_class_filter.phpt b/ext/standard/tests/filters/stream_filter_register_mock_class_filter.phpt
index 4d2309a718eb..b06783a0f78f 100644
--- a/ext/standard/tests/filters/stream_filter_register_mock_class_filter.phpt
+++ b/ext/standard/tests/filters/stream_filter_register_mock_class_filter.phpt
@@ -1,7 +1,30 @@
 --TEST--
 stream_filter_register() with a class name exist that mocks php_user_filter with a filter method
---XFAIL--
-This leaks memory
+--SKIPIF--
+<?php
+
+// this leaks memory
+// remove SKIPIF section when GH-20058 is merged OR when debug
+// builds report "warn: XFAIL section but test passes"
+
+if (getenv('SKIP_MSAN')) {
+	die('skip requires a leak detector');
+}
+
+if (getenv('SKIP_ASAN') && PHP_OS_FAMILY !== 'Windows') {
+	die('xfail User filters leak unprocessed buckets');
+}
+
+if (PHP_DEBUG && getenv('USE_ZEND_ALLOC') !== '0') {
+	die('xfail User filters leak unprocessed buckets');
+}
+
+if (getenv('USE_ZEND_ALLOC') === '0' && getenv('ZEND_DONT_UNLOAD_MODULES') === '1') {
+	die('xleak User filters leak unprocessed buckets');
+}
+
+die('skip requires a leak detector');
+?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/filters/stream_filter_register_unprocessed_buckets.phpt b/ext/standard/tests/filters/stream_filter_register_unprocessed_buckets.phpt
new file mode 100644
index 000000000000..e468c79a5104
--- /dev/null
+++ b/ext/standard/tests/filters/stream_filter_register_unprocessed_buckets.phpt
@@ -0,0 +1,80 @@
+--TEST--
+stream_filter_register() with classes that leave unprocessed buckets for PSFS_FEED_ME and PSFS_ERR_FATAL
+--SKIPIF--
+<?php
+
+// this leaks memory
+// remove SKIPIF section when debug builds report "warn: XFAIL section but test passes"
+
+if (getenv('SKIP_MSAN')) {
+	die('skip requires a leak detector');
+}
+
+if (getenv('SKIP_ASAN') && PHP_OS_FAMILY !== 'Windows') {
+	die('xfail User filters leak unprocessed buckets');
+}
+
+if (PHP_DEBUG && getenv('USE_ZEND_ALLOC') !== '0') {
+	die('xfail User filters leak unprocessed buckets');
+}
+
+if (getenv('USE_ZEND_ALLOC') === '0' && getenv('ZEND_DONT_UNLOAD_MODULES') === '1') {
+	die('xleak User filters leak unprocessed buckets');
+}
+
+die('skip requires a leak detector');
+?>
+--FILE--
+<?php
+
+class FeedFilter extends php_user_filter
+{
+	public function filter($in, $out, &$consumed, bool $closing): int {
+		return PSFS_FEED_ME;
+	}
+}
+
+class FatalFilter extends php_user_filter
+{
+	private bool $emitted = false;
+
+	public function filter($in, $out, &$consumed, bool $closing): int
+	{
+		if ($closing && !$this->emitted) {
+			$this->emitted = true;
+			$bucket = stream_bucket_new($this->stream, "x");
+			stream_bucket_append($out, $bucket);
+		}
+
+		return PSFS_ERR_FATAL;
+	}
+}
+
+stream_filter_register("test.feed", FeedFilter::class);
+
+$stream = fopen("php://memory", "w+");
+fwrite($stream, "x\nabcdef");
+rewind($stream);
+
+var_dump(fgets($stream));
+var_dump(stream_filter_append($stream, "test.feed", STREAM_FILTER_READ));
+fclose($stream);
+
+stream_filter_register("test.fatal", FatalFilter::class);
+
+$stream = fopen("php://memory", "w+");
+$filter = stream_filter_append($stream, "test.fatal", STREAM_FILTER_WRITE);
+
+var_dump(stream_filter_remove($filter));
+fclose($stream);
+
+?>
+--EXPECTF--
+string(2) "x
+"
+
+Warning: stream_filter_append(): Unprocessed filter buckets remaining on input brigade in %s on line %d
+resource(%d) of type (stream filter)
+
+Warning: stream_filter_remove(): Unable to flush filter, not removing in %s on line %d
+bool(false)
diff --git a/ext/standard/tests/filters/stream_filter_register_unprocessed_buckets_reentrant.phpt b/ext/standard/tests/filters/stream_filter_register_unprocessed_buckets_reentrant.phpt
new file mode 100644
index 000000000000..cb17993bd2da
--- /dev/null
+++ b/ext/standard/tests/filters/stream_filter_register_unprocessed_buckets_reentrant.phpt
@@ -0,0 +1,68 @@
+--TEST--
+stream_filter_register() with a class whose input brigade is modified by a warning handler
+--SKIPIF--
+<?php
+
+// this leaks memory
+// remove SKIPIF section when debug builds report "warn: XFAIL section but test passes"
+
+if (getenv('SKIP_MSAN')) {
+	die('skip requires a leak detector');
+}
+
+if (getenv('SKIP_ASAN') && PHP_OS_FAMILY !== 'Windows') {
+	die('xfail User filters leak unprocessed buckets');
+}
+
+if (PHP_DEBUG && getenv('USE_ZEND_ALLOC') !== '0') {
+	die('xfail User filters leak unprocessed buckets');
+}
+
+if (getenv('USE_ZEND_ALLOC') === '0' && getenv('ZEND_DONT_UNLOAD_MODULES') === '1') {
+	die('xleak User filters leak unprocessed buckets');
+}
+
+die('skip requires a leak detector');
+?>
+--FILE--
+<?php
+
+class ReentrantFilter extends php_user_filter
+{
+	private bool $firstCall = true;
+
+	public function filter($in, $out, &$consumed, bool $closing): int
+	{
+		if ($this->firstCall) {
+			$this->firstCall = false;
+			$GLOBALS['brigade'] = $in;
+			$GLOBALS['bucket'] = stream_bucket_new($this->stream, 'refilled');
+		}
+
+		return PSFS_PASS_ON;
+	}
+}
+
+stream_filter_register('test.reentrant', ReentrantFilter::class);
+
+set_error_handler(static function (int $severity, string $message): bool
+{
+	if (str_contains($message, 'Unprocessed filter buckets')) {
+		stream_bucket_append($GLOBALS['brigade'], $GLOBALS['bucket']);
+		echo "Handled warning\n";
+		return true;
+	}
+
+	return false;
+});
+
+$stream = fopen('php://memory', 'w+');
+stream_filter_append($stream, 'test.reentrant', STREAM_FILTER_WRITE);
+
+var_dump(fwrite($stream, 'input'));
+fclose($stream);
+
+?>
+--EXPECT--
+Handled warning
+int(0)