Fixed bug #69892

nikic · nikic · commit 5fe078abba7d · 2015-06-20T16:40:14.000+02:00
diff --git a/NEWS b/NEWS
@@ -13,8 +13,10 @@
     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 #69892 (Different arrays compare indentical due to integer key
+    truncation). (Nikita)
 
 - GD:
   . Fixed bug #61221 (imagegammacorrect function loses alpha channel). (cmb)
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
@@ -1534,11 +1534,10 @@ ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t co
 		}
 		if (ordered) {
 			if (p1->nKeyLength==0 && p2->nKeyLength==0) { /* 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 */
 				result = p1->nKeyLength - p2->nKeyLength;

Original file line number	Diff line number	Diff line change
`@@ -1534,11 +1534,10 @@ ZEND_API int zend_hash_compare(HashTable ht1, HashTable ht2, compare_func_t co`
`1534`	`1534`	`}`
`1535`	`1535`	`if (ordered) {`
`1536`	`1536`	`if (p1->nKeyLength==0 && p2->nKeyLength==0) { /* numeric indices */`
`1537`		`- result = p1->h - p2->h;`
`1538`		`- if (result!=0) {`
	`1537`	`+ if (p1->h != p2->h) {`
`1539`	`1538`	`HASH_UNPROTECT_RECURSION(ht1);`
`1540`	`1539`	`HASH_UNPROTECT_RECURSION(ht2);`
`1541`		`- return result;`
	`1540`	`+ return p1->h > p2->h ? 1 : -1;`
`1542`	`1541`	`}`
`1543`	`1542`	`} else { /* string indices */`
`1544`	`1543`	`result = p1->nKeyLength - p2->nKeyLength;`