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

Fix ext/zend_test/tests/observer_bug81430_2.phpt failure

Browse source
This commit is contained in:
Dmitry Stogov 2022-01-12 12:08:59 +03:00 • committed by Remi Collet
parent 78974a4776
commit 7e6558edf1
No known key found for this signature in database
GPG key ID: DC9FF8D3EE5AF27F
1 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

46
ext/reflection/php_reflection.c
View file

@ -6522,9 +6522,7 @@ static int call_attribute_constructor(
zval *args, uint32_t argc, HashTable *named_params, zend_string *filename) zval *args, uint32_t argc, HashTable *named_params, zend_string *filename)
{ {
zend_function *ctor = ce->constructor; zend_function *ctor = ce->constructor;
zend_execute_data *prev_execute_data, dummy_frame; zend_execute_data *call = NULL;
zend_function dummy_func;
zend_op dummy_opline;
ZEND_ASSERT(ctor != NULL); ZEND_ASSERT(ctor != NULL);
if (!(ctor->common.fn_flags & ZEND_ACC_PUBLIC)) { if (!(ctor->common.fn_flags & ZEND_ACC_PUBLIC)) {
@ -6535,31 +6533,43 @@ static int call_attribute_constructor(
if (filename) { if (filename) {
/* Set up dummy call frame that makes it look like the attribute was invoked /* Set up dummy call frame that makes it look like the attribute was invoked
* from where it occurs in the code. */ * from where it occurs in the code. */
memset(&dummy_frame, 0, sizeof(zend_execute_data)); zend_function dummy_func;
zend_op *opline;
memset(&dummy_func, 0, sizeof(zend_function)); memset(&dummy_func, 0, sizeof(zend_function));
memset(&dummy_opline, 0, sizeof(zend_op));
prev_execute_data = EG(current_execute_data); call = zend_vm_stack_push_call_frame_ex(
dummy_frame.prev_execute_data = prev_execute_data; ZEND_MM_ALIGNED_SIZE_EX(sizeof(zend_execute_data), sizeof(zval)) +
dummy_frame.func = &dummy_func; ZEND_MM_ALIGNED_SIZE_EX(sizeof(zend_op), sizeof(zval)) +
dummy_frame.opline = &dummy_opline; ZEND_MM_ALIGNED_SIZE_EX(sizeof(zend_function), sizeof(zval)),
0, &dummy_func, 0, NULL);
dummy_func.type = ZEND_USER_FUNCTION; opline = (zend_op*)(call + 1);
dummy_func.common.fn_flags = memset(opline, 0, sizeof(zend_op));
opline->opcode = ZEND_DO_FCALL;
opline->lineno = attr->lineno;
call->opline = opline;
call->call = NULL;
call->return_value = NULL;
call->func = (zend_function*)(call->opline + 1);
call->prev_execute_data = EG(current_execute_data);
memset(call->func, 0, sizeof(zend_function));
call->func->type = ZEND_USER_FUNCTION;
call->func->op_array.fn_flags =
attr->flags & ZEND_ATTRIBUTE_STRICT_TYPES ? ZEND_ACC_STRICT_TYPES : 0; attr->flags & ZEND_ATTRIBUTE_STRICT_TYPES ? ZEND_ACC_STRICT_TYPES : 0;
dummy_func.common.fn_flags |= ZEND_ACC_CALL_VIA_TRAMPOLINE; call->func->op_array.fn_flags |= ZEND_ACC_CALL_VIA_TRAMPOLINE;
dummy_func.op_array.filename = filename; call->func->op_array.filename = filename;
dummy_opline.opcode = ZEND_DO_FCALL; EG(current_execute_data) = call;
dummy_opline.lineno = attr->lineno;
EG(current_execute_data) = &dummy_frame;
} }
zend_call_known_function(ctor, obj, obj->ce, NULL, argc, args, named_params); zend_call_known_function(ctor, obj, obj->ce, NULL, argc, args, named_params);
if (filename) { if (filename) {
EG(current_execute_data) = prev_execute_data; EG(current_execute_data) = call->prev_execute_data;
zend_vm_stack_free_call_frame(call);
} }
if (EG(exception)) { if (EG(exception)) {