diff options
| author | Xinchen Hui <laruence@php.net> | 2012-10-18 20:10:35 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-10-18 20:10:35 +0800 |
| commit | e88cdaa0143aacd2d765eb0560452ea28e327e41 (patch) | |
| tree | 1b1eededa92c7116c679980ef990764ee09f588e | |
| parent | 8bd5e15ff7a57791956c4017ee8fb4a8ac0d8d2e (diff) | |
| download | php-git-e88cdaa0143aacd2d765eb0560452ea28e327e41.tar.gz | |
better fix for #63055
| -rw-r--r-- | Zend/zend_variables.c | 2 | ||||
| -rw-r--r-- | ext/pcre/php_pcre.c | 3 |
2 files changed, 3 insertions, 2 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); } diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 1af8151251..736a70871a 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -547,9 +547,8 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int subjec /* Overwrite the passed-in value for subpatterns with an empty array. */ if (subpats != NULL) { - zval garbage = *subpats; + zval_dtor(subpats); array_init(subpats); - zval_dtor(&garbage); } subpats_order = global ? PREG_PATTERN_ORDER : 0; |