com php-src: Fixed string destruction (class_name might be reused and stored somewhere in __autoload ()).: Zend/zend_constants.c
| From: | Dmitry Stogov | Date: | Thu, 24 Jul 2014 10:11:21 +0000 |
| Subject: | com php-src: Fixed string destruction (class_name might be reused and stored somewhere in __autoload ()).: Zend/zend_constants.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79578@lists.php.net to get a copy of this message | ||
Commit: 466816d4ef44a54a6846cc08ad583bf600f832aa
Author: Dmitry Stogov <dmitry@zend.com> Thu, 24 Jul 2014 14:11:21 +0400
Parents: 7c6477ce37974f5d41cbbf245c27a2d0e6df1f6a
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=466816d4ef44a54a6846cc08ad583bf600f832aa
Log:
Fixed string destruction (class_name might be reused and stored somewhere in __autoload()).
Changed paths:
M Zend/zend_constants.c
Diff:
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 650a566..b134ed4 100644
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -398,7 +398,7 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope,
ret_constant = Z_REFVAL_P(ret_constant);
}
}
- STR_FREE(class_name);
+ STR_RELEASE(class_name);
STR_FREE(constant_name);
if (ret_constant && Z_CONSTANT_P(ret_constant)) {
zval_update_constant_ex(ret_constant, 1, ce TSRMLS_CC);