diff options
| author | Xinchen Hui <laruence@php.net> | 2015-03-05 18:40:06 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-03-05 18:40:06 +0800 |
| commit | 168be6f250bbbef39ffb0b4cef63f2a75e4aeffd (patch) | |
| tree | 6f9340be26041b49b8e5588b4cd4a5d2becf45a7 /Zend/zend_opcode.c | |
| parent | eaa1b3e6142b8aa5ac2081884ff52a853d68284a (diff) | |
| parent | f039225597b51f2ee02a050391d497ae68d63b39 (diff) | |
| download | php-git-168be6f250bbbef39ffb0b4cef63f2a75e4aeffd.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'Zend/zend_opcode.c')
| -rw-r--r-- | Zend/zend_opcode.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index d6b015be9e..4fff320f35 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -256,9 +256,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) { + zend_uint j = 0; + zend_trait_precedence *cur_precedence = ce->trait_precedences[i]; + while (cur_precedence->exclude_from_classes[j]) { + efree(cur_precedence->exclude_from_classes[j]); + j++; + } efree(ce->trait_precedences[i]->exclude_from_classes); } - efree(ce->trait_precedences[i]); i++; } |