summaryrefslogtreecommitdiff
path: root/ext/reflection/php_reflection.c
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2019-02-27 09:18:20 +0100
committerJoe Watkins <krakjoe@php.net>2019-02-27 09:18:20 +0100
commit0e391d14bf01423866f3c398f6e883b8e9793b70 (patch)
treecb983e4a2069c48e0b85089c0c45474a2a80120e /ext/reflection/php_reflection.c
parent701c4170adc2566dedcfdecdcef450946d8cb83f (diff)
parentb9ab686179ca81a9784ec44409765806dcbfe8de (diff)
downloadphp-git-0e391d14bf01423866f3c398f6e883b8e9793b70.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Fix #77673 ReflectionClass::getDefaultProperties returns spooky array
Diffstat (limited to 'ext/reflection/php_reflection.c')
-rw-r--r--ext/reflection/php_reflection.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 729b477467..1f825e65d4 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -3754,7 +3754,7 @@ static void add_class_vars(zend_class_entry *ce, int statics, zval *return_value
} else if (!statics && (prop_info->flags & ZEND_ACC_STATIC) == 0) {
prop = &ce->default_properties_table[OBJ_PROP_TO_NUM(prop_info->offset)];
}
- if (!prop) {
+ if (!prop || (prop_info->type && Z_ISUNDEF_P(prop))) {
continue;
}