diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-06-30 20:11:39 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-06-30 20:11:39 +0200 |
| commit | 0f1726e45d4ef04446e3208a0928edcf51869b4a (patch) | |
| tree | a4b6c8d96f4c36ca4c5fa6514085153b55e2de7e /Zend | |
| parent | 34deda13a8ff13df825d412312232f845d1cf387 (diff) | |
| parent | 9b0df97a42749464069859c5ca77c0241a8b05ca (diff) | |
| download | php-git-0f1726e45d4ef04446e3208a0928edcf51869b4a.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_execute.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 3edbb9c7d6..1101214e88 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -990,9 +990,12 @@ static int zend_verify_internal_return_type(zend_function *zf, zval *ret) zend_class_entry *ce = NULL; void *dummy_cache_slot = NULL; - if (UNEXPECTED(ZEND_TYPE_CODE(ret_info->type) == IS_VOID && Z_TYPE_P(ret) != IS_NULL)) { - zend_verify_void_return_error(zf, zend_zval_type_name(ret), ""); - return 0; + if (ZEND_TYPE_CODE(ret_info->type) == IS_VOID) { + if (UNEXPECTED(Z_TYPE_P(ret) != IS_NULL)) { + zend_verify_void_return_error(zf, zend_zval_type_name(ret), ""); + return 0; + } + return 1; } if (UNEXPECTED(!zend_check_type(ret_info->type, ret, &ce, &dummy_cache_slot, NULL, NULL, 1))) { |