From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 1 Apr 2014 09:57:23 +0000 (+0400)
Subject: Fixed char*/zend_string* mess
X-Git-Tag: POST_PHPNG_MERGE~412^2~191
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98ca90c91095d13bad7e9f17d89c3fc0abdbc4be;p=php

Fixed char*/zend_string* mess
---

diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 08108d283f..7f339603e4 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) {