diff options
| author | Levi Morrison <levim@php.net> | 2017-12-12 22:39:28 -0700 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-13 21:25:00 +0100 |
| commit | 580bae4a2c5997fbc0c7ef87304e8814c5576aeb (patch) | |
| tree | dd867de067a54361c2fbafb60282a0850c5fc88b | |
| parent | f749448fc657b8b06e5d338f5f24227add134c21 (diff) | |
| download | php-git-580bae4a2c5997fbc0c7ef87304e8814c5576aeb.tar.gz | |
Fix copy-and-paste bugs
| -rw-r--r-- | Zend/zend_API.c | 4 | ||||
| -rw-r--r-- | Zend/zend_closures.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index e70fefa3b5..1070dcecbd 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2351,7 +2351,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio if (clone) { clone->common.fn_flags |= ZEND_ACC_CLONE; if (clone->common.fn_flags & ZEND_ACC_STATIC) { - zend_error(error_type, "Constructor %s::%s() cannot be static", ZSTR_VAL(scope->name), ZSTR_VAL(clone->common.function_name)); + zend_error(error_type, "%s::%s() cannot be static", ZSTR_VAL(scope->name), ZSTR_VAL(clone->common.function_name)); } clone->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC; } @@ -2411,7 +2411,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio zend_error_noreturn(E_CORE_ERROR, "Destructor %s::%s() cannot declare a return type", ZSTR_VAL(scope->name), ZSTR_VAL(dtor->common.function_name)); } - if (clone && clone->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE && dtor->common.fn_flags & ZEND_ACC_DTOR) { + if (clone && (clone->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE)) { zend_error_noreturn(E_CORE_ERROR, "%s::%s() cannot declare a return type", ZSTR_VAL(scope->name), ZSTR_VAL(clone->common.function_name)); } efree((char*)lc_class_name); diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index b047aaf3a9..95902f71e1 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -244,7 +244,7 @@ static void zend_closure_call_magic(INTERNAL_FUNCTION_PARAMETERS) /* {{{ */ { zval params[2]; memset(&fci, 0, sizeof(zend_fcall_info)); - memset(&fci, 0, sizeof(zend_fcall_info_cache)); + memset(&fcc, 0, sizeof(zend_fcall_info_cache)); fci.size = sizeof(zend_fcall_info); fci.retval = return_value; |