archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed bug with returning from internal function by reference

Browse source
This commit is contained in:
Dmitry Stogov 2005-07-21 13:48:10 +00:00
parent 8a3d3aefbb
commit 6b5f4da085
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_vm_def.h
View file

@ -1838,8 +1838,10 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
} }
EG(current_execute_data) = EXECUTE_DATA; EG(current_execute_data) = EXECUTE_DATA;
if (!EX(function_state).function->common.return_reference) {
EX_T(opline->result.u.var).var.ptr->is_ref = 0; EX_T(opline->result.u.var).var.ptr->is_ref = 0;
EX_T(opline->result.u.var).var.ptr->refcount = 1; EX_T(opline->result.u.var).var.ptr->refcount = 1;
}
if (!return_value_used) { if (!return_value_used) {
zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr); zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr);
} }