Merge branch 'PHP-5.5' into PHP-5.6

nikic · nikic · commit e09d3155a172 · 2015-06-20T16:40:53.000+02:00
diff --git a/NEWS b/NEWS
@@ -15,8 +15,10 @@ PHP                                                                        NEWS
     7/8/8.1/10 as "Business"). (Christian Wenz)
   . Fixed bug #69740 (finally in generator (yield) swallows exception in
     iteration). (Nikita)
-  . 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
@@ -1446,11 +1446,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
`@@ -1446,11 +1446,10 @@ ZEND_API int zend_hash_compare(HashTable ht1, HashTable ht2, compare_func_t co`
`1446`	`1446`	`}`
`1447`	`1447`	`if (ordered) {`
`1448`	`1448`	`if (p1->nKeyLength==0 && p2->nKeyLength==0) { /* numeric indices */`
`1449`		`- result = p1->h - p2->h;`
`1450`		`- if (result!=0) {`
	`1449`	`+ if (p1->h != p2->h) {`
`1451`	`1450`	`HASH_UNPROTECT_RECURSION(ht1);`
`1452`	`1451`	`HASH_UNPROTECT_RECURSION(ht2);`
`1453`		`- return result;`
	`1452`	`+ return p1->h > p2->h ? 1 : -1;`
`1454`	`1453`	`}`
`1455`	`1454`	`} else { /* string indices */`
`1456`	`1455`	`result = p1->nKeyLength - p2->nKeyLength;`