Commit c3fb04f89b3 for php
commit c3fb04f89b3a0e4928fcd3376cf39da1f2512655
Author: Gina Peter Banyard <girgias@php.net>
Date: Tue Oct 6 13:33:44 2026 +0100
std: refactor userfilter_assign_stream() to take zend_object*
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 68432ed5cd5..640d2ae8c00 100644
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -137,15 +137,15 @@ static void userfilter_dtor(php_stream_filter *thisfilter)
zval_ptr_dtor(obj);
}
-static zend_result userfilter_assign_stream(php_stream *stream, zval *obj,
+static zend_result userfilter_assign_stream(php_stream *stream, zend_object *obj,
zend_string **stream_name_p, uint32_t orig_no_fclose)
{
/* Give the userfilter class a hook back to the stream */
const zend_class_entry *old_scope = EG(fake_scope);
- EG(fake_scope) = Z_OBJCE_P(obj);
+ EG(fake_scope) = obj->ce;
zend_string *stream_name = ZSTR_INIT_LITERAL("stream", false);
- bool stream_property_exists = Z_OBJ_HT_P(obj)->has_property(Z_OBJ_P(obj), stream_name, ZEND_PROPERTY_EXISTS, NULL);
+ bool stream_property_exists = obj->handlers->has_property(obj, stream_name, ZEND_PROPERTY_EXISTS, NULL);
if (stream_property_exists) {
zval stream_zval;
if (EXPECTED(stream->res && stream->res->type >= 0)) {
@@ -153,7 +153,7 @@ static zend_result userfilter_assign_stream(php_stream *stream, zval *obj,
} else {
ZVAL_NULL(&stream_zval);
}
- zend_update_property_ex(Z_OBJCE_P(obj), Z_OBJ_P(obj), stream_name, &stream_zval);
+ zend_update_property_ex(obj->ce, obj, stream_name, &stream_zval);
/* If property update threw an exception, skip filter execution */
if (EG(exception)) {
EG(fake_scope) = old_scope;
@@ -197,7 +197,7 @@ static php_stream_filter_status_t userfilter_filter(
stream->flags |= PHP_STREAM_FLAG_NO_FCLOSE;
zend_string *stream_name = NULL;
- if (userfilter_assign_stream(stream, obj, &stream_name, orig_no_fclose) == FAILURE) {
+ if (userfilter_assign_stream(stream, Z_OBJ_P(obj), &stream_name, orig_no_fclose) == FAILURE) {
if (buckets_in->head) {
php_error_docref(NULL, E_WARNING, "Unprocessed filter buckets remaining on input brigade");
userfilter_release_brigade(buckets_in);
@@ -319,7 +319,7 @@ static zend_result userfilter_seek(
stream->flags |= PHP_STREAM_FLAG_NO_FCLOSE;
zend_string *stream_name = NULL;
- if (userfilter_assign_stream(stream, obj, &stream_name, orig_no_fclose) == FAILURE) {
+ if (userfilter_assign_stream(stream, Z_OBJ_P(obj), &stream_name, orig_no_fclose) == FAILURE) {
return FAILURE;
}