diff options
| author | ULF WENDEL <uw@php.net> | 2012-10-22 13:38:02 +0200 |
|---|---|---|
| committer | ULF WENDEL <uw@php.net> | 2012-10-22 13:38:02 +0200 |
| commit | 77fd708a0b81bf6dfcfce6aba24eaa606b97f630 (patch) | |
| tree | 08ac6b2b913d20b60c18909986d1106010b538cb /Zend/zend_variables.c | |
| parent | c64ff20836173fc35a22092b9e586f80ac722e22 (diff) | |
| parent | 7d59b2264e4ea75c34c86df756a2c2795b94753f (diff) | |
| download | php-git-77fd708a0b81bf6dfcfce6aba24eaa606b97f630.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (22 commits)
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
update NEWS
updated NEWS
Fixed bug #63284 PCRE upgrade to 8.31
preg indenpent test script for #63055
Update libmagic.patch
Add fix & missing fix
Add fix & missing fix
Fixed bug #63307 (Unused variable in oci8.c)
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
- 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)
I forgot that inconsistent is only avaliable in debug mode
Add comments
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
...
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 70e61122a8..25a66a197c 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); } |