diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-12 10:59:28 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-12 10:59:28 +0800 |
| commit | f2940b7120a0dc77ccfaacceed04faaa68b4dc23 (patch) | |
| tree | a49fe936fd0d61e6b702c8ebb2d77dbda716eefd | |
| parent | e6d8bad618b17b67ae4faff5c87721c2d755c71d (diff) | |
| download | php-git-f2940b7120a0dc77ccfaacceed04faaa68b4dc23.tar.gz | |
Fixed bug #69017 (Fail to push to the empty array with the constant value defined in class scope)
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | Zend/zend_hash.c | 3 |
2 files changed, 7 insertions, 0 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 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: . Bug #68964 (Allowed memory size exhausted with odbc_exec). (Anatol) diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 1fab471e04..b18fd59da8 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -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) { p->h = num_index; + if ((long)num_index >= (long)ht->nNextFreeElement) { + ht->nNextFreeElement = num_index < LONG_MAX ? num_index + 1 : LONG_MAX; + } } else { p->h = h; p->nKeyLength = str_length; |