archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix abort too early

Browse source
This commit is contained in:
Aaron Piotrowski 2016-06-05 02:01:01 -05:00
parent c2266c382a
commit cf0290c273
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Zend/zend_inheritance.c
View file

@ -178,6 +178,8 @@ static zend_bool zend_iterable_type_check(zend_arg_info *arg_info) /* {{{ */
if (ce && instanceof_function(ce, zend_ce_traversable)) {
return 1;
}
return 0;
}
if (arg_info->type_hint == IS_ITERABLE || arg_info->type_hint == IS_ARRAY) {
@ -336,11 +338,11 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c
proto_arg_info = &proto->common.arg_info[proto->common.num_args];
}
if (fe_arg_info->type_hint == IS_ITERABLE && zend_iterable_type_check(proto_arg_info)) {
continue;
}
if (!zend_do_perform_type_hint_check(fe, fe_arg_info, proto, proto_arg_info)) {
if (fe_arg_info->type_hint == IS_ITERABLE) {
if (!zend_iterable_type_check(proto_arg_info)) {
return 0;
}
} else if (!zend_do_perform_type_hint_check(fe, fe_arg_info, proto, proto_arg_info)) {
return 0;
}
@ -364,11 +366,11 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c
return 0;
}
if (proto->common.arg_info[-1].type_hint == IS_ITERABLE && zend_iterable_type_check(fe->common.arg_info - 1)) {
return 1;
}
if (!zend_do_perform_type_hint_check(fe, fe->common.arg_info - 1, proto, proto->common.arg_info - 1)) {
if (proto->common.arg_info[-1].type_hint == IS_ITERABLE) {
if (!zend_iterable_type_check(fe->common.arg_info - 1)) {
return 0;
}
} else if (!zend_do_perform_type_hint_check(fe, fe->common.arg_info - 1, proto, proto->common.arg_info - 1)) {
return 0;
}