diff options
| author | George Wang <gwang@php.net> | 2014-10-03 16:43:08 -0400 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2014-10-03 16:43:08 -0400 |
| commit | ef0eed7f5ff34236b39d9c5914e1627ef30c7cb7 (patch) | |
| tree | aa1b356321816109d462cacbb0c7986e3abe3153 /Zend/zend_variables.c | |
| parent | 0cc2600ec64d882df7f44390bfd5411750f86947 (diff) | |
| parent | d67c05bb899f4db42dd568376112b9144de2b5f1 (diff) | |
| download | php-git-ef0eed7f5ff34236b39d9c5914e1627ef30c7cb7.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index b875445120..9674de5246 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -136,6 +136,7 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) ALLOC_HASHTABLE_REL(tmp_ht); zend_hash_init(tmp_ht, zend_hash_num_elements(original_ht), NULL, ZVAL_PTR_DTOR, 0); zend_hash_copy(tmp_ht, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); + tmp_ht->nNextFreeElement = original_ht->nNextFreeElement; zvalue->value.ht = tmp_ht; } break; |