com php-src: Fix strict array comparison: Zend/zend_hash.c
| From: | Dmitry Stogov | Date: | Wed, 23 Apr 2014 18:34:45 +0000 |
| Subject: | com php-src: Fix strict array comparison: Zend/zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77306@lists.php.net to get a copy of this message | ||
Commit: c98d373eb62df9abbfe0cccb6d20c5e00745e003
Author: Nikita Popov <nikic@php.net> Wed, 23 Apr 2014 20:33:16 +0200
Parents: 58089c5977260f91773a87d1aeb77d17c2dd146e
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c98d373eb62df9abbfe0cccb6d20c5e00745e003
Log:
Fix strict array comparison
Fixes Symfony test failures
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 38e027d..ffe71a6 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -1655,7 +1655,7 @@ ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t
co
HASH_UNPROTECT_RECURSION(ht2);
return 1; /* That's not supposed to happen */
}
- if (p2) break;
+ if (Z_TYPE(p2->val) != IS_UNDEF) break;
idx2++;
}
if (p1->key == NULL && p2->key == NULL) { /* numeric indices */