com php-src: Fixed char*/zend_string* mess: Zend/zend _opcode.c
| From: | Dmitry Stogov | Date: | Tue, 01 Apr 2014 09:57:23 +0000 |
| Subject: | com php-src: Fixed char*/zend_string* mess: Zend/zend _opcode.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77503@lists.php.net to get a copy of this message | ||
Commit: 98ca90c91095d13bad7e9f17d89c3fc0abdbc4be
Author: Dmitry Stogov <dmitry@zend.com> Tue, 1 Apr 2014 13:57:23 +0400
Parents: 0da12b9273e4cb56be9b31f2e026bda1b9610146
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=98ca90c91095d13bad7e9f17d89c3fc0abdbc4be
Log:
Fixed char*/zend_string* mess
Changed paths:
M Zend/zend_opcode.c
Diff:
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 08108d2..7f33960 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -242,16 +242,16 @@ void _destroy_zend_class_traits_info(zend_class_entry *ce)
while (ce->trait_aliases[i]) {
if (ce->trait_aliases[i]->trait_method) {
if (ce->trait_aliases[i]->trait_method->method_name) {
- efree((char*)ce->trait_aliases[i]->trait_method->method_name);
+ STR_RELEASE(ce->trait_aliases[i]->trait_method->method_name);
}
if (ce->trait_aliases[i]->trait_method->class_name) {
- efree((char*)ce->trait_aliases[i]->trait_method->class_name);
+ STR_RELEASE(ce->trait_aliases[i]->trait_method->class_name);
}
efree(ce->trait_aliases[i]->trait_method);
}
if (ce->trait_aliases[i]->alias) {
- efree((char*)ce->trait_aliases[i]->alias);
+ STR_RELEASE(ce->trait_aliases[i]->alias);
}
efree(ce->trait_aliases[i]);
@@ -265,8 +265,8 @@ void _destroy_zend_class_traits_info(zend_class_entry *ce)
size_t i = 0;
while (ce->trait_precedences[i]) {
- efree((char*)ce->trait_precedences[i]->trait_method->method_name);
- efree((char*)ce->trait_precedences[i]->trait_method->class_name);
+ STR_RELEASE(ce->trait_precedences[i]->trait_method->method_name);
+ STR_RELEASE(ce->trait_precedences[i]->trait_method->class_name);
efree(ce->trait_precedences[i]->trait_method);
if (ce->trait_precedences[i]->exclude_from_classes) {