Fixed bug #69017 (Fail to push to the empty array with the constant value defined in class scope)

This commit is contained in:
Xinchen Hui 2015-02-12 10:59:28 +08:00
parent e6d8bad618
commit f2940b7120
2 changed files with 7 additions and 0 deletions

4
NEWS
View File

@ -2,6 +2,10 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2015, PHP 5.5.23 ?? ??? 2015, PHP 5.5.23
- Core:
. Fixed bug #69017 (Fail to push to the empty array with the constant value
defined in class scope). (Laruence)
- ODBC: - ODBC:
. Bug #68964 (Allowed memory size exhausted with odbc_exec). (Anatol) . Bug #68964 (Allowed memory size exhausted with odbc_exec). (Anatol)

View File

@ -1415,6 +1415,9 @@ ZEND_API int zend_hash_update_current_key_ex(HashTable *ht, int key_type, const
if (key_type == HASH_KEY_IS_LONG) { if (key_type == HASH_KEY_IS_LONG) {
p->h = num_index; p->h = num_index;
if ((long)num_index >= (long)ht->nNextFreeElement) {
ht->nNextFreeElement = num_index < LONG_MAX ? num_index + 1 : LONG_MAX;
}
} else { } else {
p->h = h; p->h = h;
p->nKeyLength = str_length; p->nKeyLength = str_length;