#28789: ReflectionProperty getValue() fails on public static members

diff --git a/Zend/zend_reflection_api.c b/Zend/zend_reflection_api.c
index 7817f41330fbca270490fcae7d7a66373e53f99f..f198cbd5936482c0f51b0c305f17d6a2e80594f8 100644 (file)
--- a/Zend/zend_reflection_api.c
+++ b/Zend/zend_reflection_api.c
@@ -2873,7 +2873,7 @@ ZEND_METHOD(reflection_property, getValue)
        METHOD_NOTSTATIC;
        GET_REFLECTION_OBJECT_PTR(ref);
 
-       if (ref->prop->flags & ~ZEND_ACC_PUBLIC) {
+       if (!(ref->prop->flags & ZEND_ACC_PUBLIC)) {
                _DO_THROW("Cannot access non-public member");
                /* Returns from this function */
        }
@@ -2882,9 +2882,16 @@ ZEND_METHOD(reflection_property, getValue)
                return;
        }
 
-       if (zend_hash_quick_find(Z_OBJPROP_P(object), ref->prop->name, ref->prop->name_length + 1, ref->prop->h, (void **) &member) == FAILURE) {
-               zend_error(E_ERROR, "Internal error: Could not find the property %s", ref->prop->name);
-               /* Bails out */
+       if ((ref->prop->flags & ZEND_ACC_STATIC)) {
+               if (zend_hash_quick_find(Z_OBJCE_P(object)->static_members, ref->prop->name, ref->prop->name_length + 1, ref->prop->h, (void **) &member) == FAILURE) {
+                       zend_error(E_ERROR, "Internal error: Could not find the property %s", ref->prop->name);
+                       /* Bails out */
+               }
+       } else {
+               if (zend_hash_quick_find(Z_OBJPROP_P(object), ref->prop->name, ref->prop->name_length + 1, ref->prop->h, (void **) &member) == FAILURE) {
+                       zend_error(E_ERROR, "Internal error: Could not find the property %s", ref->prop->name);
+                       /* Bails out */
+               }
        }
 
        *return_value= **member;

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 7817f41330fbca270490fcae7d7a66373e53f99f..f198cbd5936482c0f51b0c305f17d6a2e80594f8 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -2873,7 +2873,7 @@ ZEND_METHOD(reflection_property, getValue)
        METHOD_NOTSTATIC;
        GET_REFLECTION_OBJECT_PTR(ref);
 
-       if (ref->prop->flags & ~ZEND_ACC_PUBLIC) {
+       if (!(ref->prop->flags & ZEND_ACC_PUBLIC)) {
                _DO_THROW("Cannot access non-public member");
                /* Returns from this function */
        }
@@ -2882,9 +2882,16 @@ ZEND_METHOD(reflection_property, getValue)
                return;
        }
 
-       if (zend_hash_quick_find(Z_OBJPROP_P(object), ref->prop->name, ref->prop->name_length + 1, ref->prop->h, (void **) &member) == FAILURE) {
-               zend_error(E_ERROR, "Internal error: Could not find the property %s", ref->prop->name);
-               /* Bails out */
+       if ((ref->prop->flags & ZEND_ACC_STATIC)) {
+               if (zend_hash_quick_find(Z_OBJCE_P(object)->static_members, ref->prop->name, ref->prop->name_length + 1, ref->prop->h, (void **) &member) == FAILURE) {
+                       zend_error(E_ERROR, "Internal error: Could not find the property %s", ref->prop->name);
+                       /* Bails out */
+               }
+       } else {
+               if (zend_hash_quick_find(Z_OBJPROP_P(object), ref->prop->name, ref->prop->name_length + 1, ref->prop->h, (void **) &member) == FAILURE) {
+                       zend_error(E_ERROR, "Internal error: Could not find the property %s", ref->prop->name);
+                       /* Bails out */
+               }
        }
 
        *return_value= **member;