diff options
| author | Xinchen Hui <laruence@php.net> | 2015-03-05 20:57:48 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-03-05 21:05:26 +0800 |
| commit | 869f8bd24bbabdf91198f99b1ee124c91d2696ce (patch) | |
| tree | 0bdd6a9dc91e5cce1b813312f24303b261d29a02 | |
| parent | f039225597b51f2ee02a050391d497ae68d63b39 (diff) | |
| download | php-git-869f8bd24bbabdf91198f99b1ee124c91d2696ce.tar.gz | |
Error also maybe happened here
| -rw-r--r-- | Zend/zend_compile.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index edd45bfccc..04f17ba573 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4072,6 +4072,7 @@ static void zend_check_trait_usage(zend_class_entry *ce, zend_class_entry *trait static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* {{{ */ { size_t i, j = 0; + zend_trait_precedence **precedences; zend_trait_precedence *cur_precedence; zend_trait_method_reference *cur_method_ref; char *lcname; @@ -4080,7 +4081,9 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* /* resolve class references */ if (ce->trait_precedences) { i = 0; - while ((cur_precedence = ce->trait_precedences[i])) { + precedences = ce->trait_precedences; + ce->trait_precedences = NULL; + while ((cur_precedence = precedences[i])) { /** Resolve classes for all precedence operations. */ if (cur_precedence->exclude_from_classes) { cur_method_ref = cur_precedence->trait_method; @@ -4137,6 +4140,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* } i++; } + ce->trait_precedences = precedences; } if (ce->trait_aliases) { |