diff options
| author | John Boehr <jbboehr@gmail.com> | 2015-05-03 14:29:19 -0700 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-05-04 10:33:26 +0800 |
| commit | 56fdae9018818f63c77c7cc3f3edb80ea3784d45 (patch) | |
| tree | fcf5a1134236262f07a658136bbee161090fdbf0 | |
| parent | 428d0983cd785b9cc91f291d5b22c4411a966f94 (diff) | |
| download | php-git-56fdae9018818f63c77c7cc3f3edb80ea3784d45.tar.gz | |
Fix uninitialized value with extension traits
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -5,6 +5,8 @@ PHP NEWS 14 Jun 2015, PHP 5.6.9 - Core: + . Fixed bug #69566 (Conditional jump or move depends on uninitialised value + in extension trait). (jbboehr at gmail dot com) . Fixed bug #69467 (Wrong checked for the interface by using Trait). (Laruence) . Fixed bug #69420 (Invalid read in zend_std_get_method). (Laruence) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 0f343e7f14..d2f9fbc8d7 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4101,7 +4101,7 @@ static int zend_fixup_trait_method(zend_function *fn, zend_class_entry *ce TSRML if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) { ce->ce_flags |= ZEND_ACC_IMPLICIT_ABSTRACT_CLASS; } - if (fn->op_array.static_variables) { + if (fn->type == ZEND_USER_FUNCTION && fn->op_array.static_variables) { ce->ce_flags |= ZEND_HAS_STATIC_IN_METHODS; } } |