diff options
| author | Xinchen Hui <laruence@php.net> | 2013-06-09 13:35:45 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-06-09 13:35:45 +0800 |
| commit | ab22fda7e52f097297f1dcdf06f474cea858adc0 (patch) | |
| tree | 3b74349a5c45685d764217e680dc4af520bd14e1 /Zend/zend_vm_execute.h | |
| parent | a7e25bdd486c28958c2db2f28c9fda63bb938405 (diff) | |
| parent | e8f004d54252e0130b88131bdc46a41ed365c51e (diff) | |
| download | php-git-ab22fda7e52f097297f1dcdf06f474cea858adc0.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 18b3f4772c..ad6d708381 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -648,6 +648,8 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR if (!RETURN_VALUE_USED(opline)) { zval_ptr_dtor(&ret->var.ptr); } + } else if (RETURN_VALUE_USED(opline)) { + EX_T(opline->result.u.var).var.ptr = NULL; } } else if (fbc->type == ZEND_USER_FUNCTION) { EX(original_return_value) = EG(return_value_ptr_ptr); |