archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2'

Browse source 
* PHP-8.2:
  Don’t reset func in zend_closure_internal_handler
This commit is contained in:
Christoph M. Becker 2022-11-02 14:02:34 +01:00
commit b2199f9559
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Zend/zend_closures.c
View file

@ -696,7 +696,6 @@ static ZEND_NAMED_FUNCTION(zend_closure_internal_handler) /* {{{ */
zend_closure *closure = (zend_closure*)ZEND_CLOSURE_OBJECT(EX(func)); zend_closure *closure = (zend_closure*)ZEND_CLOSURE_OBJECT(EX(func));
closure->orig_internal_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU); closure->orig_internal_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU);
OBJ_RELEASE((zend_object*)closure); OBJ_RELEASE((zend_object*)closure);
EX(func) = NULL;
} }
/* }}} */ /* }}} */

2
Zend/zend_observer.c
View file

@ -208,6 +208,7 @@ ZEND_API bool zend_observer_remove_end_handler(zend_function *function, zend_obs
static inline zend_execute_data **prev_observed_frame(zend_execute_data *execute_data) { static inline zend_execute_data **prev_observed_frame(zend_execute_data *execute_data) {
zend_function *func = EX(func); zend_function *func = EX(func);
ZEND_ASSERT(func);
return (zend_execute_data **)&Z_PTR_P(EX_VAR_NUM((ZEND_USER_CODE(func->type) ? func->op_array.last_var : ZEND_CALL_NUM_ARGS(execute_data)) + func->common.T - 1)); return (zend_execute_data **)&Z_PTR_P(EX_VAR_NUM((ZEND_USER_CODE(func->type) ? func->op_array.last_var : ZEND_CALL_NUM_ARGS(execute_data)) + func->common.T - 1));
} }
@ -260,6 +261,7 @@ ZEND_API void ZEND_FASTCALL zend_observer_fcall_begin(zend_execute_data *execute
static inline void call_end_observers(zend_execute_data *execute_data, zval *return_value) { static inline void call_end_observers(zend_execute_data *execute_data, zval *return_value) {
zend_function *func = execute_data->func; zend_function *func = execute_data->func;
ZEND_ASSERT(func);
zend_observer_fcall_end_handler *handler = (zend_observer_fcall_end_handler *)&ZEND_OBSERVER_DATA(func) + zend_observers_fcall_list.count; zend_observer_fcall_end_handler *handler = (zend_observer_fcall_end_handler *)&ZEND_OBSERVER_DATA(func) + zend_observers_fcall_list.count;
// TODO: Fix exceptions from generators // TODO: Fix exceptions from generators

26
ext/zend_test/tests/observer_closure_03.phpt Normal file
View file

@ -0,0 +1,26 @@
--TEST--
Observer: Observability of closures of builtin functions
--EXTENSIONS--
zend_test
--INI--
zend_test.observer.enabled=1
zend_test.observer.observe_all=1
--FILE--
<?php
$closure = strlen(...);
var_dump($closure('test'));
echo 'DONE' . PHP_EOL;
?>
--EXPECTF--
<!-- init '%s' -->
<file '%s'>
<!-- init strlen() -->
<strlen>
</strlen>
<!-- init var_dump() -->
<var_dump>
int(4)
</var_dump>
DONE
</file '%s'>