diff options
| author | Felipe Pena <felipensp@gmail.com> | 2012-08-22 10:50:50 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2012-08-22 10:50:50 -0300 |
| commit | 7a56ac00a04d4fc72052bb679626e723da3eef44 (patch) | |
| tree | 8a2fbb0a4684a9f85590b53977e067d9b3442f69 /ext/reflection | |
| parent | 22f55d56659d31a3546556dd39f3833af6d1fa3d (diff) | |
| download | php-git-7a56ac00a04d4fc72052bb679626e723da3eef44.tar.gz | |
- Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)
Diffstat (limited to 'ext/reflection')
| -rw-r--r-- | ext/reflection/php_reflection.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 6656f58c65..7c9981924d 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4464,8 +4464,10 @@ ZEND_METHOD(reflection_class, getTraitAliases) int method_name_len; zend_trait_method_reference *cur_ref = ce->trait_aliases[i]->trait_method; - method_name_len = spprintf(&method_name, 0, "%s::%s", cur_ref->class_name, cur_ref->method_name); - add_assoc_stringl_ex(return_value, ce->trait_aliases[i]->alias, ce->trait_aliases[i]->alias_len + 1, method_name, method_name_len, 0); + if (ce->trait_aliases[i]->alias) { + method_name_len = spprintf(&method_name, 0, "%s::%s", cur_ref->class_name, cur_ref->method_name); + add_assoc_stringl_ex(return_value, ce->trait_aliases[i]->alias, ce->trait_aliases[i]->alias_len + 1, method_name, method_name_len, 0); + } i++; } } |