summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2010-04-20 12:30:35 +0000
committerDmitry Stogov <dmitry@php.net>2010-04-20 12:30:35 +0000
commit4c252d805dac560a900b4214246b33b8b08de5e7 (patch)
treeba9f9c4195519135eec39b3238af7636860ea9dd
parent0b401e12891fd9fe773d66add86f2c4093527b46 (diff)
downloadphp-git-4c252d805dac560a900b4214246b33b8b08de5e7.tar.gz
Fixed bug #48781 (Cyclical garbage collector memory leak)
-rw-r--r--NEWS1
-rw-r--r--Zend/zend_execute.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 7ac9fb380e..0eb325bb2e 100644
--- a/NEWS
+++ b/NEWS
@@ -75,6 +75,7 @@ PHP NEWS
(yoarvi@gmail.com, Derick)
- Fixed bug #48983 (DomDocument : saveHTMLFile wrong charset). (Rob)
- Fixed bug #48902 (Timezone database fallback map is outdated). (Derick)
+- Fixed bug #48781 (Cyclical garbage collector memory leak). (Dmitry)
- Fixed bug #46111 (Some timezone identifiers can not be parsed). (Derick)
- Fixed bug #35673 (formatOutput does not work with saveHTML). (Rob)
- Implement feature request #35638 (Adding udate to imap_fetch_overview results).
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index ae54c5fa1b..5ddb03a8c3 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -708,6 +708,7 @@ static inline zval* zend_assign_to_variable(zval **variable_ptr_ptr, zval *value
return variable_ptr;
}
} else { /* we need to split */
+ GC_ZVAL_CHECK_POSSIBLE_ROOT(*variable_ptr_ptr);
if (!is_tmp_var) {
if (PZVAL_IS_REF(value) && Z_REFCOUNT_P(value) > 0) {
ALLOC_ZVAL(variable_ptr);