com php-src: In case the string can't be interned it must not be released: Zend/zend_compile.c
| From: | Dmitry Stogov | Date: | Tue, 01 Apr 2014 10:35:34 +0000 |
| Subject: | com php-src: In case the string can't be interned it must not be released: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77507@lists.php.net to get a copy of this message | ||
Commit: 015e5dc43b1ad098289bce59947ee84da8f04367
Author: Dmitry Stogov <dmitry@zend.com> Tue, 1 Apr 2014 14:35:34 +0400
Parents: 70b7950a75609c4386f996fe7cb1a005447262b4
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=015e5dc43b1ad098289bce59947ee84da8f04367
Log:
In case the string can't be interned it must not be released
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 8dcaf29..1d461dd 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6239,7 +6239,9 @@ void zend_do_indirect_references(znode *result, const znode *num_references,
zno
if (CG(active_op_array)->scope && CG(active_op_array)->this_var == -1) {
zend_string *key = STR_INIT("this", sizeof("this")-1, 0);
CG(active_op_array)->this_var = lookup_cv(CG(active_op_array), key TSRMLS_CC);
- STR_RELEASE(key);
+ if (CG(active_op_array)->vars[EX_VAR_TO_NUM(CG(active_op_array)->this_var)] != key) {
+ STR_RELEASE(key);
+ }
}
}
/* }}} */