diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-11-07 09:54:05 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-11-07 09:54:05 +0300 |
| commit | e120438c8c06b03308fa1f585623059a093a3604 (patch) | |
| tree | 642966eeb6fd1a86cb557159ec98f508ab48cc8c /Zend/zend_variables.c | |
| parent | 8fccf0bac9eab67412612b2df14da58b9129c6b2 (diff) | |
| parent | ed4c0245c7ca51490ea10e2756076285560a5d88 (diff) | |
| download | php-git-e120438c8c06b03308fa1f585623059a093a3604.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 8a41902a97..75230babda 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -137,9 +137,9 @@ 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); + zvalue->value.ht = tmp_ht; 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; case IS_CONSTANT_AST: |