summaryrefslogtreecommitdiff
path: root/Zend/zend_opcode.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-03-05 18:41:12 +0800
committerXinchen Hui <laruence@php.net>2015-03-05 18:44:13 +0800
commitf2c8b611cf32dc76ff8ba73057a16bf8ff1ee6d7 (patch)
tree2b710485a152aed4d4ef83f2cc95fdbd6c4635eb /Zend/zend_opcode.c
parentfd5a756ad44124ffa7e9a5810a31ff49e91708cf (diff)
parent56f9dc2d5902b9ae60da369fec449902f8dafa9e (diff)
downloadphp-git-f2c8b611cf32dc76ff8ba73057a16bf8ff1ee6d7.tar.gz
Merge branch 'PHP-5.6'
Diffstat (limited to 'Zend/zend_opcode.c')
-rw-r--r--Zend/zend_opcode.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index e76cfe9498..fbfadfa871 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -221,9 +221,14 @@ void _destroy_zend_class_traits_info(zend_class_entry *ce)
efree(ce->trait_precedences[i]->trait_method);
if (ce->trait_precedences[i]->exclude_from_classes) {
+ size_t j = 0;
+ zend_trait_precedence *cur_precedence = ce->trait_precedences[i];
+ while (cur_precedence->exclude_from_classes[j].class_name) {
+ zend_string_release(cur_precedence->exclude_from_classes[j].class_name);
+ j++;
+ }
efree(ce->trait_precedences[i]->exclude_from_classes);
}
-
efree(ce->trait_precedences[i]);
i++;
}