archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Error also maybe happened here

Browse source
This commit is contained in:
Xinchen Hui 2015-03-05 20:57:48 +08:00
parent f039225597
commit 869f8bd24b
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Zend/zend_compile.c
View file

@ -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) /* {{{ */ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* {{{ */
{ {
size_t i, j = 0; size_t i, j = 0;
zend_trait_precedence **precedences;
zend_trait_precedence *cur_precedence; zend_trait_precedence *cur_precedence;
zend_trait_method_reference *cur_method_ref; zend_trait_method_reference *cur_method_ref;
char *lcname; char *lcname;
@ -4080,7 +4081,9 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
/* resolve class references */ /* resolve class references */
if (ce->trait_precedences) { if (ce->trait_precedences) {
i = 0; 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. */ /** Resolve classes for all precedence operations. */
if (cur_precedence->exclude_from_classes) { if (cur_precedence->exclude_from_classes) {
cur_method_ref = cur_precedence->trait_method; 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++; i++;
} }
ce->trait_precedences = precedences;
} }
if (ce->trait_aliases) { if (ce->trait_aliases) {