]> granicus.if.org Git - php/commitdiff
- Fixed bug #47643 (array_diff() takes over 3000 times longer than php 5.2.4)
authorFelipe Pena <felipe@php.net>
Mon, 1 Nov 2010 17:16:47 +0000 (17:16 +0000)
committerFelipe Pena <felipe@php.net>
Mon, 1 Nov 2010 17:16:47 +0000 (17:16 +0000)
ext/standard/array.c

index f0c20c3121c4270914023a962d5052e30f79ff55..c9074394b2b87026080763b0041db093e4fa246b 100644 (file)
@@ -3561,8 +3561,8 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
                for (i = 1; i < arr_argc; i++) {
                        Bucket **ptr = ptrs[i];
                        if (behavior == DIFF_NORMAL) {
-                               while (*ptr && (0 < (c = diff_data_compare_func(ptrs[0], ptr TSRMLS_CC)))) {
-                                       ptr++;
+                               while (*ptrs[i] && (0 < (c = diff_data_compare_func(ptrs[0], ptrs[i] TSRMLS_CC)))) {
+                                       ptrs[i]++;
                                }
                        } else if (behavior & DIFF_ASSOC) { /* triggered also when DIFF_KEY */
                                while (*ptr && (0 != (c = diff_key_compare_func(ptrs[0], ptr TSRMLS_CC)))) {