diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-06-21 13:48:35 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-06-21 13:48:35 +0200 |
| commit | 706ac6417162d94eb701952d40df136cd9528b56 (patch) | |
| tree | 1858b0f397d16519dbd73c998d7a89001af362d2 /Zend/zend_vm_def.h | |
| parent | e2d52710fa3134e72662116b3b495f5a22cf9c72 (diff) | |
| download | php-upstream/5.5.0+dfsg.tar.gz | |
New upstream version 5.5.0+dfsgupstream/5.5.0+dfsg
Diffstat (limited to 'Zend/zend_vm_def.h')
| -rw-r--r-- | Zend/zend_vm_def.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 386641a62..ca62ddecc 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1996,6 +1996,8 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY) if (!RETURN_VALUE_USED(opline)) { zval_ptr_dtor(&ret->var.ptr); } + } else if (RETURN_VALUE_USED(opline)) { + EX_T(opline->result.var).var.ptr = NULL; } } else if (fbc->type == ZEND_USER_FUNCTION) { EX(original_return_value) = EG(return_value_ptr_ptr); |