com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_v ariables.c

Commit: e120438c8c06b03308fa1f585623059a093a3604 Author: Dmitry Stogov <dmitry@zend.com> Fri, 7 Nov 2014 09:54:05 +0300 Parents: 8fccf0bac9eab67412612b2df14da58b9129c6b2 ed4c0245c7ca51490ea10e2756076285560a5d88 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e120438c8c06b03308fa1f585623059a093a3604 Log: 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) Bugs: https://bugs.php.net/68365 https://bugs.php.net/68351 Changed paths: MM Zend/zend_variables.c Diff: diff --cc Zend/zend_variables.c index 8a41902,cc73c37..75230ba --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@@ -137,14 -135,11 +137,14 @@@ ZEND_API void _zval_copy_ctor_func(zva } 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: + Z_AST_P(zvalue) = zend_ast_copy(Z_AST_P(zvalue)); + break; case IS_OBJECT: { TSRMLS_FETCH();