mattwil Sun Jun 7 19:28:33 2009 UTC
Added files: (Branch: PHP_5_2)
/ZendEngine2/tests bug47836.phpt
Modified files:
/php-src NEWS
/ZendEngine2 zend_hash.c
/php-src/ext/standard/tests/array array_push_error2.phpt
Log:
MFH: Fixed bug #47836 (array operator [] inconsistency when the array has
PHP_INT_MAX index value)
Also simplified related array_push() test
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1541&r2=1.2027.2.547.2.1542&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1541 php-src/NEWS:1.2027.2.547.2.1542
--- php-src/NEWS:1.2027.2.547.2.1541 Wed Jun 3 12:41:46 2009
+++ php-src/NEWS Sun Jun 7 19:28:32 2009
@@ -19,6 +19,8 @@
- Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values).
(Ilia, lytboris at gmail dot com)
- Fixed bug #48247 (Crash on errors during startup). (Stas)
+- Fixed bug #47836 (array operator [] inconsistency when the array has
+ PHP_INT_MAX index value). (Matt)
- Fixed bug #46386 (Digest authentication with SOAP module fails against MSSQL
SOAP services). (Ilia, lordelph at gmail dot com)
- Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.c?r1=1.121.2.4.2.10&r2=1.121.2.4.2.11&diff_format=u
Index: ZendEngine2/zend_hash.c
diff -u ZendEngine2/zend_hash.c:1.121.2.4.2.10
ZendEngine2/zend_hash.c:1.121.2.4.2.11
--- ZendEngine2/zend_hash.c:1.121.2.4.2.10 Wed Dec 31 11:17:33 2008
+++ ZendEngine2/zend_hash.c Sun Jun 7 19:28:32 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_hash.c,v 1.121.2.4.2.10 2008/12/31 11:17:33 sebastian Exp $ */
+/* $Id: zend_hash.c,v 1.121.2.4.2.11 2009/06/07 19:28:32 mattwil Exp $ */
#include "zend.h"
@@ -376,7 +376,7 @@
UPDATE_DATA(ht, p, pData, nDataSize);
HANDLE_UNBLOCK_INTERRUPTIONS();
if ((long)h >= (long)ht->nNextFreeElement) {
- ht->nNextFreeElement = h + 1;
+ ht->nNextFreeElement = h < LONG_MAX ? h + 1 :
LONG_MAX;
}
if (pDest) {
*pDest = p->pData;
@@ -404,7 +404,7 @@
HANDLE_UNBLOCK_INTERRUPTIONS();
if ((long)h >= (long)ht->nNextFreeElement) {
- ht->nNextFreeElement = h + 1;
+ ht->nNextFreeElement = h < LONG_MAX ? h + 1 : LONG_MAX;
}
ht->nNumOfElements++;
ZEND_HASH_IF_FULL_DO_RESIZE(ht);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_push_error2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/array/array_push_error2.phpt
diff -u php-src/ext/standard/tests/array/array_push_error2.phpt:1.1.2.2
php-src/ext/standard/tests/array/array_push_error2.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_push_error2.phpt:1.1.2.2 Fri Mar
14 23:13:07 2008
+++ php-src/ext/standard/tests/array/array_push_error2.phpt Sun Jun 7
19:28:33 2009
@@ -1,9 +1,5 @@
--TEST--
-Test array_push() function : error conditions - min and max int values as keys
---SKIPIF--
-<?php
-if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
-?>
+Test array_push() function : error conditions - max int value as key
--FILE--
<?php
/* Prototype : int array_push(array $stack, mixed $var [, mixed $...])
@@ -12,42 +8,27 @@
*/
/*
- * Use PHP's minimum and maximum integer values as array keys
+ * Use PHP's maximum integer value as array key
* then try and push new elements onto the array
*/
echo "*** Testing array_push() : error conditions ***\n";
-$array = array(-PHP_INT_MAX => 'min', PHP_INT_MAX => 'max');
+$array = array(PHP_INT_MAX => 'max');
var_dump(array_push($array, 'new'));
var_dump($array);
-var_dump(array_push($array, 'var'));
-var_dump($array);
echo "Done";
?>
--EXPECTF--
*** Testing array_push() : error conditions ***
-int(3)
-array(3) {
- [-2147483647]=>
- string(3) "min"
- [2147483647]=>
- string(3) "max"
- [-2147483648]=>
- string(3) "new"
-}
Warning: array_push(): Cannot add element to the array as the next element is
already occupied in %s on line %d
bool(false)
-array(3) {
- [-2147483647]=>
- string(3) "min"
- [2147483647]=>
+array(1) {
+ [%d]=>
string(3) "max"
- [-2147483648]=>
- string(3) "new"
}
Done
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug47836.phpt?view=markup&rev=1.1
Index: ZendEngine2/tests/bug47836.phpt
+++ ZendEngine2/tests/bug47836.phpt
--TEST--
Bug #47836 (array operator [] inconsistency when the array has PHP_INT_MAX
index value)
--FILE--
<?php
$arr[PHP_INT_MAX] = 1;
$arr[] = 2;
var_dump($arr);
?>
--EXPECTF--
Warning: Cannot add element to the array as the next element is already
occupied in %s on line 4
array(1) {
[%d]=>
int(1)
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
