diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-02-08 14:08:31 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-02-08 14:08:31 +0000 |
| commit | f2825042b4dd9aa941a080c027f15f41c1b9e4bc (patch) | |
| tree | 2e7d97c1dfd4aeabb506ffdd206a612b82adea8d /Zend/zend_vm_execute.h | |
| parent | 0a81f9a0bd36deac8707949acbcf92f612b60e8e (diff) | |
| parent | ce9f52adcdfb19f70dc4274f3587e58ac07995bd (diff) | |
| download | php-git-f2825042b4dd9aa941a080c027f15f41c1b9e4bc.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/json.c
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 80a31331e5..19e1a741b5 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -601,6 +601,10 @@ static int ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) zend_vm_stack_free_args(call); zend_vm_stack_free_call_frame(call); + ZEND_ASSERT( + !(fbc->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE) || + zend_verify_internal_return_type(fbc, EX_VAR(opline->result.var))); + if (!RETURN_VALUE_USED(opline)) { zval_ptr_dtor(EX_VAR(opline->result.var)); } |