com php-src: Fixed reference counting: Zend/zend_execute.c

From: Date: Mon, 20 Apr 2015 15:49:17 +0000
Subject: com php-src: Fixed reference counting: Zend/zend_execute.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86403@lists.php.net to get a copy of this message
Commit: b99174136c19df728ced6e9ab24b890e82b4cb0e Author: Dmitry Stogov <dmitry@zend.com> Mon, 20 Apr 2015 18:49:17 +0300 Parents: b1a03d7d39a7e00bbe6e7c33ce1ec127c3b097d1 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b99174136c19df728ced6e9ab24b890e82b4cb0e Log: Fixed reference counting Changed paths: M Zend/zend_execute.c Diff: diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 18839ab..cbe6ef1 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1044,7 +1044,7 @@ fast_assign: } if (!zobj->ce->__set) { - zval *ref = NULL; + zend_reference *ref = NULL; if (EXPECTED(zobj->properties == NULL)) { rebuild_object_properties(zobj); @@ -1058,8 +1058,8 @@ fast_assign: } } else if (value_type != IS_TMP_VAR) { if (Z_ISREF_P(value)) { - if (value_type == IS_CV) { - ref = value; + if (value_type == IS_VAR) { + ref = Z_REF_P(value); } value = Z_REFVAL_P(value); if (Z_REFCOUNTED_P(value)) { @@ -1074,7 +1074,9 @@ fast_assign: ZVAL_COPY(retval, value); } if (/*value_type == IS_VAR &&*/ ref) { - efree_size(ref, sizeof(zend_reference)); + if (UNEXPECTED(--GC_REFCOUNT(ref) == 0)) { + efree_size(ref, sizeof(zend_reference)); + } } return; }

« previous php.cvs (#86403) next »