summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2007-11-05 23:53:23 +0000
committerIlia Alshanetsky <iliaa@php.net>2007-11-05 23:53:23 +0000
commit35ab31e7ad7f95144e7f336678ee4355c148b72a (patch)
tree27404abefd0732e0920d383c7bc70addc46a09e6
parentb3a334eaf20e4f6b05e9c6a0472d99df98b6dcbb (diff)
downloadphp-git-35ab31e7ad7f95144e7f336678ee4355c148b72a.tar.gz
Fixed bug #43197 (array_intersect_assoc() does not emit warning messages for
error inputs)
-rw-r--r--ext/standard/array.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c
index f620209605..0b5b698891 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2749,11 +2749,13 @@ static void php_array_intersect_key(INTERNAL_FUNCTION_PARAMETERS, int data_compa
argc = ZEND_NUM_ARGS();
if (data_compare_type == INTERSECT_COMP_DATA_USER) {
if (argc < 3 || zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+f", &args, &argc, &BG(user_compare_fci), &BG(user_compare_fci_cache)) == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "at least 3 parameters are required, %d given", ZEND_NUM_ARGS());
return;
}
intersect_data_compare_func = zval_user_compare;
} else {
if (argc < 2 || zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "at least 2 parameters are required, %d given", ZEND_NUM_ARGS());
return;
}
if (data_compare_type == INTERSECT_COMP_DATA_INTERNAL) {