Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 32 additions & 35 deletions ext/standard/user_filters.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,23 +137,23 @@ 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)) {
php_stream_to_zval(stream, &stream_zval);
} 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;
Expand All @@ -172,20 +172,15 @@ static zend_result userfilter_assign_stream(php_stream *stream, zval *obj,
}

static php_stream_filter_status_t userfilter_filter(
php_stream *stream,
php_stream_filter *thisfilter,
php_stream_bucket_brigade *buckets_in,
php_stream_bucket_brigade *buckets_out,
size_t *bytes_consumed,
int flags
)
{
php_stream *stream,
php_stream_filter *thisfilter,
php_stream_bucket_brigade *buckets_in,
php_stream_bucket_brigade *buckets_out,
size_t *bytes_consumed,
int flags
) {
int ret = PSFS_ERR_FATAL;
zval *obj = &thisfilter->abstract;
zval func_name;
zval retval;
zval args[4];
int call_result;
zend_object *obj = Z_OBJ(thisfilter->abstract);

/* the userfilter object probably doesn't exist anymore */
if (CG(unclean_shutdown)) {
Expand Down Expand Up @@ -216,8 +211,8 @@ static php_stream_filter_status_t userfilter_filter(
}
}

ZVAL_STRINGL(&func_name, "filter", sizeof("filter")-1);

zval retval;
zval args[4];
/* Setup calling arguments */
ZVAL_RES(&args[0], zend_register_resource(buckets_in, le_bucket_brigade));
ZVAL_RES(&args[1], zend_register_resource(buckets_out, le_bucket_brigade));
Expand All @@ -231,24 +226,31 @@ static php_stream_filter_status_t userfilter_filter(

ZVAL_BOOL(&args[3], flags & PSFS_FLAG_FLUSH_CLOSE);

call_result = call_user_function(NULL,
obj,
&func_name,
&retval,
4, args);
char *error = NULL;
zend_string *func_name = ZSTR_INIT_LITERAL("filter", false);
zend_result call_result = zend_call_method_if_exists_ex(obj, func_name, &retval, 4, args, NULL, &error);
zend_string_release_ex(func_name, false);

zval_ptr_dtor(&func_name);
/* No need to release args[3] as it is a boolean, delay freeing or args[2] to fetch by-ref value. */
zval_ptr_dtor(&args[1]);
zval_ptr_dtor(&args[0]);

if (call_result == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
/* Method does not exist or exception thrown */
if (UNEXPECTED(Z_ISUNDEF(retval))) {
if (call_result == FAILURE) {
zend_throw_error(NULL, "Invalid callback %pS::filter, %s", obj->ce->name, error);
efree(error);
}
} else {
// TODO: TypeError if value is not int?
convert_to_long(&retval);
ret = (int)Z_LVAL(retval);
} else if (call_result == FAILURE) {
php_error_docref(NULL, E_WARNING, "Failed to call filter function");
}

if (bytes_consumed) {
*bytes_consumed = zval_get_long(&args[2]);
}
zval_ptr_dtor(&args[2]);

if (buckets_in->head) {
if (ret == PSFS_FEED_ME && !(flags & PSFS_FLAG_FLUSH_CLOSE)) {
Expand Down Expand Up @@ -276,15 +278,10 @@ static php_stream_filter_status_t userfilter_filter(
* no type hint or be typed as mixed, so we can safely assign null.
*/
if (stream_name != NULL) {
zend_update_property_null(Z_OBJCE_P(obj), Z_OBJ_P(obj), ZSTR_VAL(stream_name), ZSTR_LEN(stream_name));
zend_update_property_null(obj->ce, obj, ZSTR_VAL(stream_name), ZSTR_LEN(stream_name));
zend_string_release(stream_name);
}

zval_ptr_dtor(&args[3]);
zval_ptr_dtor(&args[2]);
zval_ptr_dtor(&args[1]);
zval_ptr_dtor(&args[0]);

stream->flags &= ~PHP_STREAM_FLAG_NO_FCLOSE;
stream->flags |= orig_no_fclose;

Expand Down Expand Up @@ -319,7 +316,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;
}

Expand Down
Loading