Merge branch 'PHP-5.6'

nikic · nikic · commit 9589d26ef3d8 · 2015-06-20T16:50:37.000+02:00
Conflicts:
	Zend/zend_hash.c
diff --git a/NEWS b/NEWS
@@ -20,10 +20,12 @@ PHP                                                                        NEWS
     fault). (Christoph M. Becker)
   . Fixed bug #69781 (phpinfo() reports Professional Editions of Windows
     7/8/8.1/10 as "Business"). (Christian Wenz)
-  . Fixes bug #69835 (phpinfo() does not report many Windows SKUs).
+  . Fixed bug #69835 (phpinfo() does not report many Windows SKUs).
     (Christian Wenz)
   . Fixed bug #69889 (Null coalesce operator doesn't work for string offsets).
     (Nikita)
+  . Fixed bug #69892 (Different arrays compare indentical due to integer key
+    truncation). (Nikita)
 
 - DOM:
   . Fixed bug #69846 (Segmenation fault (access violation) when iterating over
diff --git a/Zend/tests/bug69892.phpt b/Zend/tests/bug69892.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #69892: Different arrays compare indentical due to integer key truncation
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only"); ?>
+--FILE--
+<?php
+var_dump([0 => 0] === [0x100000000 => 0]);
+?>
+--EXPECT--
+bool(false)
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
@@ -2243,11 +2243,10 @@ ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t co
 				idx2++;
 			}
 			if (p1->key == NULL && p2->key == NULL) { /* numeric indices */
-				result = p1->h - p2->h;
-				if (result != 0) {
+				if (p1->h != p2->h) {
 					HASH_UNPROTECT_RECURSION(ht1);
 					HASH_UNPROTECT_RECURSION(ht2);
-					return result;
+					return p1->h > p2->h ? 1 : -1;
 				}
 			} else { /* string indices */
 				size_t len0 = (p1->key ? p1->key->len : 0);

Original file line number	Diff line number	Diff line change
`@@ -2243,11 +2243,10 @@ ZEND_API int zend_hash_compare(HashTable ht1, HashTable ht2, compare_func_t co`
`2243`	`2243`	`idx2++;`
`2244`	`2244`	`}`
`2245`	`2245`	`if (p1->key == NULL && p2->key == NULL) { /* numeric indices */`
`2246`		`- result = p1->h - p2->h;`
`2247`		`- if (result != 0) {`
	`2246`	`+ if (p1->h != p2->h) {`
`2248`	`2247`	`HASH_UNPROTECT_RECURSION(ht1);`
`2249`	`2248`	`HASH_UNPROTECT_RECURSION(ht2);`
`2250`		`- return result;`
	`2249`	`+ return p1->h > p2->h ? 1 : -1;`
`2251`	`2250`	`}`
`2252`	`2251`	`} else { /* string indices */`
`2253`	`2252`	`size_t len0 = (p1->key ? p1->key->len : 0);`