com php-src: Error also maybe happened here: Zend/zend_compil e.c
| From: | Xinchen Hui | Date: | Thu, 05 Mar 2015 13:05:26 +0000 |
| Subject: | com php-src: Error also maybe happened here: Zend/zend_compil e.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85254@lists.php.net to get a copy of this message | ||
Commit: 869f8bd24bbabdf91198f99b1ee124c91d2696ce
Author: Xinchen Hui <laruence@php.net> Thu, 5 Mar 2015 20:57:48 +0800
Parents: f039225597b51f2ee02a050391d497ae68d63b39
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=869f8bd24bbabdf91198f99b1ee124c91d2696ce
Log:
Error also maybe happened here
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index edd45bf..04f17ba 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) {