diff --git a/NEWS b/NEWS index 72e91e810f9..d0ce2f19404 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2014, PHP 5.6.0 Beta 3 +- Core: + . Fixed bug #67169 (array_splice all elements, then []= gives wrong index). + (Nikita) + 01 May 2014, PHP 5.6.0 Beta 2 - CLI server: diff --git a/Zend/tests/bug67169.phpt b/Zend/tests/bug67169.phpt new file mode 100644 index 00000000000..8aa6aaf24a7 --- /dev/null +++ b/Zend/tests/bug67169.phpt @@ -0,0 +1,26 @@ +--TEST-- +Bug #67169: array_splice all elements, then []= gives wrong index +--FILE-- + +--EXPECT-- +array(1) { + [0]=> + string(1) "c" +} +array(1) { + [0]=> + string(1) "c" +} diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 309631338a4..a9fd3e9a43d 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -487,6 +487,7 @@ ZEND_API void zend_hash_reindex(HashTable *ht, zend_bool only_integer_keys) { IS_CONSISTENT(ht); if (UNEXPECTED(ht->nNumOfElements == 0)) { + ht->nNextFreeElement = 0; return; }