diff options
| author | Christopher Jones <sixd@php.net> | 2012-10-18 17:37:21 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-10-18 17:37:21 -0700 |
| commit | 79a048f76f767b071f49b79e4b2c224986e849a2 (patch) | |
| tree | 802a7d094c47088daa0a1f534f5bd601ffefdad8 /Zend/zend_variables.c | |
| parent | 131dd88505d5a9588ede36b22206bf13965d9137 (diff) | |
| parent | 8f7a6c3029bd1f5731492aa9897c26f421961191 (diff) | |
| download | php-git-79a048f76f767b071f49b79e4b2c224986e849a2.tar.gz | |
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
* 'PHP-5.3' of https://git.php.net/repository/php-src:
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
fix NEWS
fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql
Cover have_ssl=NO and have_ssl=DISABLED
Minor changes for MySQL 5.6
NEWS for 76601c4
Fix bug #63240 on stream_get_line()
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
fixed tests for gd having freetype >= 2.4.10
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index c7901085f8..2b2ca0f2d1 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -40,6 +40,8 @@ ZEND_API void _zval_dtor_func(zval *zvalue ZEND_FILE_LINE_DC) TSRMLS_FETCH(); if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) { + /* break possible cycles */ + Z_TYPE_P(zvalue) = IS_NULL; zend_hash_destroy(zvalue->value.ht); FREE_HASHTABLE(zvalue->value.ht); } |