Fixed Bug #44212 (array_diff_assoc not reporting missing arguments)

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 094a39679e263fc5c205ee6d85a32b6c00f24f1f..9d926ecd1ed689c37360e9f44d7dae1aab7376b8 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -3211,12 +3211,20 @@ static void php_array_diff_key(INTERNAL_FUNCTION_PARAMETERS, int data_compare_ty
        /* Get the argument count */
        argc = ZEND_NUM_ARGS();
        if (data_compare_type == DIFF_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) {
+               if (argc < 3) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "at least 3 parameters are required, %d given", ZEND_NUM_ARGS());
+                       return;
+               }
+               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+f", &args, &argc, &BG(user_compare_fci), &BG(user_compare_fci_cache)) == FAILURE) {
                        return;
                }
                diff_data_compare_func = zval_user_compare;
        } else {
-               if (argc < 2 || zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) {
+               if (argc < 2) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "at least 2 parameters are required, %d given", ZEND_NUM_ARGS());
+                       return;
+               }
+               if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &argc) == FAILURE) {
                        return;
                }
                if (data_compare_type == DIFF_COMP_DATA_INTERNAL) {