diff options
| author | Felipe Pena <felipe@php.net> | 2008-02-22 13:28:40 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-02-22 13:28:40 +0000 |
| commit | f7078d469c1a9efd398525825dbb373227e7983e (patch) | |
| tree | 9383019b04f01a89896c4e77f445fe11aa2710fa /ext/standard/array.c | |
| parent | 6ca51e664d07a2ede7eaeeaf28d176152d856dd8 (diff) | |
| download | php-git-f7078d469c1a9efd398525825dbb373227e7983e.tar.gz | |
Fixed Bug #44212 (array_diff_assoc not reporting missing arguments)
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 094a39679e..9d926ecd1e 100644 --- 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) { |