Add dedicated StreamBucket class

Author: kocsismate

ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt

@@ -8,13 +8,15 @@ $standard = new ReflectionExtension('standard');
 var_dump($standard->getClassNames());
 ?>
 --EXPECT--
-array(4) {
+array(5) {
   [0]=>
   string(22) "__PHP_Incomplete_Class"
   [1]=>
   string(14) "AssertionError"
   [2]=>
   string(15) "php_user_filter"
   [3]=>
+  string(12) "StreamBucket"
+  [4]=>
   string(9) "Directory"
 }

ext/standard/basic_functions.stub.php

@@ -3696,19 +3696,19 @@ function get_headers(string $url, bool $associative = false, $context = null): a
  * @param resource $brigade
  * @refcount 1
  */
-function stream_bucket_make_writeable($brigade): ?object {}
+function stream_bucket_make_writeable($brigade): ?StreamBucket {}
 
 /** @param resource $brigade */
-function stream_bucket_prepend($brigade, object $bucket): void {}
+function stream_bucket_prepend($brigade, StreamBucket $bucket): void {}
 
 /** @param resource $brigade */
-function stream_bucket_append($brigade, object $bucket): void {}
+function stream_bucket_append($brigade, StreamBucket $bucket): void {}
 
 /**
  * @param resource $stream
  * @refcount 1
  */
-function stream_bucket_new($stream, string $buffer): object {}
+function stream_bucket_new($stream, string $buffer): StreamBucket {}
 
 /**
  * @return array<int, string>

ext/standard/basic_functions_arginfo.h

@@ -4,6 +4,7 @@ Bug #39551 (Segfault with stream_bucket_new in user filter)
 <?php
 
 $bucket = stream_bucket_new(fopen('php://temp', 'w+'), '');
+var_dump($bucket);
 
 class bucketFilter extends php_user_filter {
     public function filter($in, $out, &$consumed, $closing ): int {
@@ -20,5 +21,13 @@ stream_get_contents($s);
 
 echo "Done\n";
 ?>
---EXPECT--
+--EXPECTF--
+object(StreamBucket)#%d (%d) {
+  ["bucket"]=>
+  resource(%d) of type (userfilter.bucket)
+  ["data"]=>
+  string(0) ""
+  ["datalen"]=>
+  int(0)
+}
 Done

ext/standard/tests/file/bug39551.phpt

@@ -61,6 +61,7 @@ PHP_METHOD(php_user_filter, onClose)
 }
 
 static zend_class_entry *user_filter_class_entry;
+static zend_class_entry *stream_bucket_class_entry;
 
 static ZEND_RSRC_DTOR_FUNC(php_bucket_dtor)
 {
@@ -75,6 +76,7 @@ PHP_MINIT_FUNCTION(user_filters)
 {
 	/* init the filter class ancestor */
 	user_filter_class_entry = register_class_php_user_filter();
+	stream_bucket_class_entry = register_class_StreamBucket();
 
 	/* Filters will dispose of their brigades */
 	le_bucket_brigade = zend_register_list_destructors_ex(NULL, NULL, PHP_STREAM_BRIGADE_RES_NAME, module_number);
@@ -366,16 +368,16 @@ PHP_FUNCTION(stream_bucket_make_writeable)
 		RETURN_THROWS();
 	}
 
-	ZVAL_NULL(return_value);
-
 	if (brigade->head && (bucket = php_stream_bucket_make_writeable(brigade->head))) {
 		ZVAL_RES(&zbucket, zend_register_resource(bucket, le_bucket));
-		object_init(return_value);
+		object_init_ex(return_value, stream_bucket_class_entry);
 		add_property_zval(return_value, "bucket", &zbucket);
 		/* add_property_zval increments the refcount which is unwanted here */
 		zval_ptr_dtor(&zbucket);
 		add_property_stringl(return_value, "data", bucket->buf, bucket->buflen);
 		add_property_long(return_value, "datalen", bucket->buflen);
+	} else {
+		ZVAL_NULL(return_value);
 	}
 }
 /* }}} */
@@ -384,38 +386,42 @@ PHP_FUNCTION(stream_bucket_make_writeable)
 static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS)
 {
 	zval *zbrigade, *zobject;
-	zval *pzbucket, *pzdata;
+	zval *pzbucket, *pzdata, rv;
 	php_stream_bucket_brigade *brigade;
 	php_stream_bucket *bucket;
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_RESOURCE(zbrigade)
-		Z_PARAM_OBJECT(zobject)
+		Z_PARAM_OBJECT_OF_CLASS(zobject, stream_bucket_class_entry)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (NULL == (pzbucket = zend_hash_str_find_deref(Z_OBJPROP_P(zobject), "bucket", sizeof("bucket")-1))) {
-		zend_argument_value_error(2, "must be an object that has a \"bucket\" property");
+	if ((brigade = (php_stream_bucket_brigade*)zend_fetch_resource(
+		Z_RES_P(zbrigade), PHP_STREAM_BRIGADE_RES_NAME, le_bucket_brigade)) == NULL) {
 		RETURN_THROWS();
 	}
 
-	if ((brigade = (php_stream_bucket_brigade*)zend_fetch_resource(
-					Z_RES_P(zbrigade), PHP_STREAM_BRIGADE_RES_NAME, le_bucket_brigade)) == NULL) {
+	if (NULL == (pzbucket = zend_read_property(NULL, Z_OBJ_P(zobject), "bucket", sizeof("bucket")-1, false, &rv))) {
+		zend_argument_value_error(2, "must be an object that has a \"bucket\" property");
 		RETURN_THROWS();
 	}
+	ZVAL_DEREF(pzbucket);
 
 	if ((bucket = (php_stream_bucket *)zend_fetch_resource_ex(pzbucket, PHP_STREAM_BUCKET_RES_NAME, le_bucket)) == NULL) {
 		RETURN_THROWS();
 	}
 
-	if (NULL != (pzdata = zend_hash_str_find_deref(Z_OBJPROP_P(zobject), "data", sizeof("data")-1)) && Z_TYPE_P(pzdata) == IS_STRING) {
-		if (!bucket->own_buf) {
-			bucket = php_stream_bucket_make_writeable(bucket);
-		}
-		if (bucket->buflen != Z_STRLEN_P(pzdata)) {
-			bucket->buf = perealloc(bucket->buf, Z_STRLEN_P(pzdata), bucket->is_persistent);
-			bucket->buflen = Z_STRLEN_P(pzdata);
+	if (NULL != (pzdata = zend_read_property(NULL, Z_OBJ_P(zobject), "data", sizeof("data")-1, false, &rv))) {
+		ZVAL_DEREF(pzdata);
+		if (Z_TYPE_P(pzdata) == IS_STRING) {
+			if (!bucket->own_buf) {
+				bucket = php_stream_bucket_make_writeable(bucket);
+			}
+			if (bucket->buflen != Z_STRLEN_P(pzdata)) {
+				bucket->buf = perealloc(bucket->buf, Z_STRLEN_P(pzdata), bucket->is_persistent);
+				bucket->buflen = Z_STRLEN_P(pzdata);
+			}
+			memcpy(bucket->buf, Z_STRVAL_P(pzdata), bucket->buflen);
 		}
-		memcpy(bucket->buf, Z_STRVAL_P(pzdata), bucket->buflen);
 	}
 
 	if (append) {
@@ -469,7 +475,7 @@ PHP_FUNCTION(stream_bucket_new)
 	bucket = php_stream_bucket_new(stream, pbuffer, buffer_len, 1, php_stream_is_persistent(stream));
 
 	ZVAL_RES(&zbucket, zend_register_resource(bucket, le_bucket));
-	object_init(return_value);
+	object_init_ex(return_value, stream_bucket_class_entry);
 	add_property_zval(return_value, "bucket", &zbucket);
 	/* add_property_zval increments the refcount which is unwanted here */
 	zval_ptr_dtor(&zbucket);

ext/standard/user_filters.c

@@ -55,3 +55,11 @@ public function onCreate(): bool {}
     /** @tentative-return-type */
     public function onClose(): void {}
 }
+
+final class StreamBucket
+{
+    /** @var resource */
+    public $bucket;
+    public string $data;
+    public int $datalen;
+}