diff options
| author | Anatol Belski <ab@php.net> | 2015-09-02 22:08:24 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-09-02 22:08:24 +0200 |
| commit | 6ef7c6358fc37579d329268cbb56ab730bed2159 (patch) | |
| tree | 2fe3452647d7450c867de9eab62f456ed77a2553 /Zend/zend_inheritance.c | |
| parent | b7e910e9696001ae6fa728c10362f657b4b97742 (diff) | |
| parent | fcece2a7bb0ecf1af1034a737bf5686a354e01d7 (diff) | |
| download | php-git-6ef7c6358fc37579d329268cbb56ab730bed2159.tar.gz | |
Merge branch 'master' into PHP-7.0.0
* master: (201 commits)
sync NEWS
Add missing variable from birdstep_commit() which got removed in e8fcd52ef
Align NEWS entries format
Add CVE for #70140 (PHP 7.0.0 Beta 3)
Seems master is not affected
We should keep one refcount to resource
Fixed bug #70398 (SIGSEGV, Segmentation fault zend_ast_destroy_ex)
Fixed test
Partially fix bug #67167 - Wrong return value...
move the phpdbg NEWS entry to the correct version
add missing news entries
Skip if ext/filter isn't loaded
Merge branch 'PHP-5.6'
5.5.30 next
Use ZSTR_VAL
fix dir separators in test
use correct api
fix leak
cleanup an atavism
add overflow check
...
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 3ccade9d0e..73b67f5216 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -213,15 +213,11 @@ static int zend_do_perform_type_hint_check(const zend_function *fe, zend_arg_inf } if (strcasecmp(ZSTR_VAL(fe_class_name), ZSTR_VAL(proto_class_name)) != 0) { - const char *colon; - if (fe->common.type != ZEND_USER_FUNCTION) { zend_string_release(proto_class_name); zend_string_release(fe_class_name); return 0; - } else if (strchr(ZSTR_VAL(proto_class_name), '\\') != NULL || - (colon = zend_memrchr(ZSTR_VAL(fe_class_name), '\\', ZSTR_LEN(fe_class_name))) == NULL || - strcasecmp(colon+1, ZSTR_VAL(proto_class_name)) != 0) { + } else { zend_class_entry *fe_ce, *proto_ce; fe_ce = zend_lookup_class(fe_class_name); @@ -345,7 +341,7 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c } /* }}} */ -static void zend_append_type_hint(smart_str *str, const zend_function *fptr, zend_arg_info *arg_info, int return_hint) /* {{{ */ +static ZEND_COLD void zend_append_type_hint(smart_str *str, const zend_function *fptr, zend_arg_info *arg_info, int return_hint) /* {{{ */ { if (arg_info->class_name) { const char *class_name; @@ -387,7 +383,7 @@ static void zend_append_type_hint(smart_str *str, const zend_function *fptr, zen } /* }}} */ -static zend_string *zend_get_function_declaration(const zend_function *fptr) /* {{{ */ +static ZEND_COLD zend_string *zend_get_function_declaration(const zend_function *fptr) /* {{{ */ { smart_str str = {0}; |