diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-12 10:59:59 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-12 10:59:59 +0800 |
| commit | 7062465be06859af76256173762c1a1f79a9d19d (patch) | |
| tree | 7b4e8a0bd41a4e3b7d76c93b60725af12f316067 | |
| parent | c741faf4bb57cff872c412cbf1183cd33f13fbed (diff) | |
| parent | f2940b7120a0dc77ccfaacceed04faaa68b4dc23 (diff) | |
| download | php-git-7062465be06859af76256173762c1a1f79a9d19d.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | Zend/zend_hash.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c index 70f4527af6..c00012c0a4 100644 --- a/Zend/zend_hash.c +++ b/Zend/zend_hash.c @@ -1269,6 +1269,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; |