jani Tue Nov 6 13:26:59 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c
/php-src/ext/standard/tests/array array_intersect_assoc_error.phpt
array_intersect_assoc_variation1.phpt
array_intersect_assoc_variation2.phpt
Log:
MFH: - Fixed bug #43196 (array_intersect_assoc() crashes with non-array input)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.7&r2=1.308.2.21.2.37.2.8&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.7
php-src/ext/standard/array.c:1.308.2.21.2.37.2.8
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.7 Mon Nov 5 23:53:23 2007
+++ php-src/ext/standard/array.c Tue Nov 6 13:26:59 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.7 2007/11/05 23:53:23 iliaa Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.8 2007/11/06 13:26:59 jani Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2763,13 +2763,24 @@
}
}
+ if (Z_TYPE_PP(args[0]) != IS_ARRAY) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument #1 is not
an array");
+ RETVAL_NULL();
+ goto out;
+ }
+
array_init(return_value);
for (p = Z_ARRVAL_PP(args[0])->pListHead; p != NULL; p = p->pListNext) {
if (p->nKeyLength == 0) {
ok = 1;
for (i = 1; i < argc; i++) {
- if (zend_hash_index_find(Z_ARRVAL_PP(args[i]),
p->h, (void**)&data) == FAILURE ||
+ if (Z_TYPE_PP(args[i]) != IS_ARRAY) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Argument #%d is not an array", i + 1);
+ zval_dtor(return_value);
+ RETVAL_NULL();
+ goto out;
+ } else if
(zend_hash_index_find(Z_ARRVAL_PP(args[i]), p->h, (void**)&data) == FAILURE ||
(intersect_data_compare_func &&
intersect_data_compare_func((zval**)p->pData, data TSRMLS_CC) != 0)
) {
@@ -2784,7 +2795,12 @@
} else {
ok = 1;
for (i = 1; i < argc; i++) {
- if (zend_hash_quick_find(Z_ARRVAL_PP(args[i]),
p->arKey, p->nKeyLength, p->h, (void**)&data) == FAILURE ||
+ if (Z_TYPE_PP(args[i]) != IS_ARRAY) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Argument #%d is not an array", i + 1);
+ zval_dtor(return_value);
+ RETVAL_NULL();
+ goto out;
+ } else if
(zend_hash_quick_find(Z_ARRVAL_PP(args[i]), p->arKey, p->nKeyLength, p->h,
(void**)&data) == FAILURE ||
(intersect_data_compare_func &&
intersect_data_compare_func((zval**)p->pData, data TSRMLS_CC) != 0)
) {
@@ -2798,6 +2814,7 @@
}
}
}
+out:
efree(args);
}
/* }}} */
@@ -3164,13 +3181,24 @@
}
}
+ if (Z_TYPE_PP(args[0]) != IS_ARRAY) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument #1 is not
an array");
+ RETVAL_NULL();
+ goto out;
+ }
+
array_init(return_value);
for (p = Z_ARRVAL_PP(args[0])->pListHead; p != NULL; p = p->pListNext) {
if (p->nKeyLength == 0) {
ok = 1;
for (i = 1; i < argc; i++) {
- if (zend_hash_index_find(Z_ARRVAL_PP(args[i]),
p->h, (void**)&data) == SUCCESS &&
+ if (Z_TYPE_PP(args[i]) != IS_ARRAY) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Argument #%d is not an array", i + 1);
+ zval_dtor(return_value);
+ RETVAL_NULL();
+ goto out;
+ } else if
(zend_hash_index_find(Z_ARRVAL_PP(args[i]), p->h, (void**)&data) == SUCCESS &&
(!diff_data_compare_func ||
diff_data_compare_func((zval**)p->pData, data TSRMLS_CC) == 0)
) {
@@ -3185,7 +3213,12 @@
} else {
ok = 1;
for (i = 1; i < argc; i++) {
- if (zend_hash_quick_find(Z_ARRVAL_PP(args[i]),
p->arKey, p->nKeyLength, p->h, (void**)&data) == SUCCESS &&
+ if (Z_TYPE_PP(args[i]) != IS_ARRAY) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Argument #%d is not an array", i + 1);
+ zval_dtor(return_value);
+ RETVAL_NULL();
+ goto out;
+ } else if
(zend_hash_quick_find(Z_ARRVAL_PP(args[i]), p->arKey, p->nKeyLength, p->h,
(void**)&data) == SUCCESS &&
(!diff_data_compare_func ||
diff_data_compare_func((zval**)p->pData, data TSRMLS_CC) == 0)
) {
@@ -3199,6 +3232,7 @@
}
}
}
+out:
efree(args);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt
diff -u
php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt:1.1.2.2
php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt:1.1.2.2
Mon Nov 5 14:31:40 2007
+++ php-src/ext/standard/tests/array/array_intersect_assoc_error.phpt Tue Nov
6 13:26:59 2007
@@ -26,11 +26,11 @@
-- Testing array_intersect_assoc() function with Zero arguments --
-Warning: Wrong parameter count for array_intersect_assoc() in %s on line %d
+Warning: array_intersect_assoc(): at least 2 parameters are required, 0 given
in %s on line %d
NULL
-- Testing array_intersect_assoc() function with less than expected no. of
arguments --
-Warning: Wrong parameter count for array_intersect_assoc() in %s on line %d
+Warning: array_intersect_assoc(): at least 2 parameters are required, 1 given
in %s on line %d
NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
diff -u
php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt:1.1.2.2
php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt:1.1.2.3
---
php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt:1.1.2.2
Mon Nov 5 14:31:40 2007
+++ php-src/ext/standard/tests/array/array_intersect_assoc_variation1.phpt
Tue Nov 6 13:26:59 2007
@@ -109,174 +109,173 @@
echo "Done";
?>
--EXPECTF--
-*** Testing array_intersect() : Passing non-array values to $arr1 argument ***
+*** Testing array_intersect_assoc() : Passing non-array values to $arr1
argument ***
--- Iterator 1 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 1 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 2 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 2 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 3 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 3 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 4 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 4 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 5 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 5 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 6 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 6 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 7 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 7 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 8 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 8 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 9 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 9 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 10 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 10 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 11 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 11 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 12 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 12 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 13 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 13 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 14 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 14 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 15 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 15 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 16 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 16 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 17 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 17 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 18 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 18 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 19 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 19 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 20 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 20 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 21 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 21 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 22 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 22 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 23 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 23 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
--- Iterator 24 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+-- Iteration 24 --
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d
NULL
Done
-
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
diff -u
php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt:1.1.2.2
php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt:1.1.2.3
---
php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt:1.1.2.2
Mon Nov 5 14:31:40 2007
+++ php-src/ext/standard/tests/array/array_intersect_assoc_variation2.phpt
Tue Nov 6 13:26:59 2007
@@ -110,174 +110,173 @@
echo "Done";
?>
--EXPECTF--
-*** Testing array_intersect() : Passing non-array values to $arr2 argument ***
+*** Testing array_intersect_assoc() : Passing non-array values to $arr2
argument ***
--- Iterator 1 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 1 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 2 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 2 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 3 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 3 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 4 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 4 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 5 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 5 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 6 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 6 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 7 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 7 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 8 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 8 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 9 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 9 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 10 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 10 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 11 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 11 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 12 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 12 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 13 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 13 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 14 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 14 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 15 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 15 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 16 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 16 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 17 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 17 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 18 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 18 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 19 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 19 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 20 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 20 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 21 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 21 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 22 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 22 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 23 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 23 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
--- Iterator 24 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+-- Iteration 24 --
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
+Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d
NULL
Done
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
