com php-src: Revert "Fix memory leak when dereferencing reference with refcount 1": Zend/zend_variables.c
| From: | Xinchen Hui | Date: | Mon, 05 Jan 2015 05:26:10 +0000 |
| Subject: | com php-src: Revert "Fix memory leak when dereferencing reference with refcount 1": Zend/zend_variables.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83983@lists.php.net to get a copy of this message | ||
Commit: 7aab9659ee9c8bc15490d16b4064d64a3846147c
Author: Xinchen Hui <laruence@php.net> Mon, 5 Jan 2015 00:26:10 -0500
Parents: 28985e982b5ecef73615a949632f7985ac72d0de
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7aab9659ee9c8bc15490d16b4064d64a3846147c
Log:
Revert "Fix memory leak when dereferencing reference with refcount 1"
This reverts commit f4cb5cc09d44e6940fecebe52b8013b288ed67c4.
breaks tests Zend/tests/bug27268.phpt and Zend/tests/bug68262.phpt
Bugs:
https://bugs.php.net/27268
https://bugs.php.net/68262
Changed paths:
M Zend/zend_variables.c
Diff:
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index b476bd9..56b9b67 100644
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -205,9 +205,7 @@ ZEND_API void zval_add_ref(zval *p)
{
if (Z_REFCOUNTED_P(p)) {
if (Z_ISREF_P(p) && Z_REFCOUNT_P(p) == 1) {
- zend_reference *ref = Z_REF_P(p);
ZVAL_COPY(p, Z_REFVAL_P(p));
- efree(ref);
} else {
Z_ADDREF_P(p);
}