]> granicus.if.org Git - php/commitdiff
MFB: Fixed bug #43197 (array_intersect_assoc() does not emit warning
authorIlia Alshanetsky <iliaa@php.net>
Mon, 5 Nov 2007 23:55:21 +0000 (23:55 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Mon, 5 Nov 2007 23:55:21 +0000 (23:55 +0000)
messages for error inputs)

ext/standard/array.c

index 590944c58839ab166c72694d779829ee9303d2a5..641b0d0fa53db9b7bce53473cb914ff3c4bd70a8 100644 (file)
@@ -2973,11 +2973,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) {