From: Felipe Pena <felipe@php.net>
Date: Fri, 22 Feb 2008 13:48:02 +0000 (+0000)
Subject: Fixed Bug #44212 (array_diff_assoc not reporting missing arguments)
X-Git-Tag: RELEASE_2_0_0a1~384
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33c6806efe787223d8670b67b0b13e3b16a2d9f5;p=php

Fixed Bug #44212 (array_diff_assoc not reporting missing arguments)
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 781eceb31a..4174608a2c 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -3435,12 +3435,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) {