com php-src: Don't miss warning messages: Zend/zend_execute .c
| From: | Dmitry Stogov | Date: | Wed, 10 Sep 2014 09:02:01 +0000 |
| Subject: | com php-src: Don't miss warning messages: Zend/zend_execute .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81484@lists.php.net to get a copy of this message | ||
Commit: c07a0dbcb9e0b9b019e2cbadb5f6f1af24c815f4
Author: Dmitry Stogov <dmitry@zend.com> Wed, 10 Sep 2014 13:02:01 +0400
Parents: 205b6b8a13f400d9f0ed5829056471df4f680bb4
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c07a0dbcb9e0b9b019e2cbadb5f6f1af24c815f4
Log:
Don't miss warning messages
Changed paths:
M Zend/zend_execute.c
Diff:
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 17f0eef..b988011 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -636,6 +636,7 @@ static inline int zend_verify_missing_arg_type(zend_function *zf, uint32_t arg_n
need_msg = zend_verify_arg_class_kind(cur_arg_info, fetch_type, &class_name, &ce
TSRMLS_CC);
zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, need_msg, class_name, "none",
"", NULL TSRMLS_CC);
+ return 0;
} else if (cur_arg_info->type_hint) {
if (cur_arg_info->type_hint == IS_ARRAY) {
zend_verify_arg_error(E_RECOVERABLE_ERROR, zf, arg_num, "be of the type array",
"", "none", "", NULL TSRMLS_CC);
@@ -646,8 +647,9 @@ static inline int zend_verify_missing_arg_type(zend_function *zf, uint32_t arg_n
zend_error(E_ERROR, "Unknown typehint");
#endif
}
+ return 0;
}
- return 0;
+ return 1;
}
static void zend_verify_missing_arg(zend_execute_data *execute_data, uint32_t arg_num TSRMLS_DC)