php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

main: drop unnecessary zend_{try|catch} in user stream open wrapper

Browse Source 
This was initially introduced with https://github.com/php/php-src/commit/9f86cdaf7fc4

However, this should also have been done for the opendir call.
This omission was found via OSS-Fuzz 51047 [1]
and fixed in a more general way in d0b3096ff0
by resetting `FG(user_stream_current_filename)` at the end of the request during shutdown.

As such this zend_try/zend_catch block is now unnecessary.

[1]: https://issues.oss-fuzz.com/issues/42515581
This commit is contained in:
Gina Peter Banyard
2025-07-31 11:28:49 +01:00
parent 1c67b060c4
commit 4d3ccc21d0
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
main/streams/userspace.c
View File

@@ -321,25 +321,19 @@ static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, const char *
goto end;
}
/* call it's stream_open method - set up params first */
zend_result call_result;
zend_try {
ZVAL_STRING(&args[0], filename);
ZVAL_STRING(&args[1], mode);
ZVAL_LONG(&args[2], options);
ZVAL_NEW_REF(&args[3], &EG(uninitialized_zval));
/* call its stream_open method - set up params first */
ZVAL_STRING(&args[0], filename);
ZVAL_STRING(&args[1], mode);
ZVAL_LONG(&args[2], options);
ZVAL_NEW_REF(&args[3], &EG(uninitialized_zval));
zend_string *func_name = ZSTR_INIT_LITERAL(USERSTREAM_OPEN, false);
call_result = zend_call_method_if_exists(Z_OBJ(us->object), func_name, &zretval, 4, args);
zend_string_release_ex(func_name, false);
zend_string *func_name = ZSTR_INIT_LITERAL(USERSTREAM_OPEN, false);
zend_result call_result = zend_call_method_if_exists(Z_OBJ(us->object), func_name, &zretval, 4, args);
zend_string_release_ex(func_name, false);
/* Keep arg3 alive if it has assigned the reference */
zval_ptr_dtor(&args[1]);
zval_ptr_dtor(&args[0]);
} zend_catch {
FG(user_stream_current_filename) = NULL;
zend_bailout();
} zend_end_try();
/* Keep arg3 alive if it has assigned the reference */
zval_ptr_dtor(&args[1]);
zval_ptr_dtor(&args[0]);
if (UNEXPECTED(call_result == FAILURE)) {
php_stream_wrapper_log_error(wrapper, options, "\"%s::" USERSTREAM_OPEN "\" is not implemented",