Fixed bug #32455 (wrong setting property to unset value)

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index f12776291b689e37404ee1097704ff67fd94ffc0..92c031f471df6932afc55e87571a4977e54a71e3 100644 (file)
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -991,10 +991,18 @@ static zval* get_zval_property(zval* object, char* name TSRMLS_DC)
                old_scope = EG(scope);
          EG(scope) = Z_OBJCE_P(object);
                data = Z_OBJ_HT_P(object)->read_property(object, &member, BP_VAR_IS TSRMLS_CC);
-               EG(scope) = old_scope;
                if (data == EG(uninitialized_zval_ptr)) {
+                       /* Hack for bug #32455 */
+                       zend_property_info *property_info;
+
+                       property_info = zend_get_property_info(Z_OBJCE_P(object), &member, 1 TSRMLS_CC);
+                       EG(scope) = old_scope;
+                       if (property_info && zend_hash_quick_exists(Z_OBJPROP_P(object), property_info->name, property_info->name_length+1, property_info->h)) {
+                               return data;
+                       }
                        return NULL;
                }
+               EG(scope) = old_scope;
                return data;
        } else if (Z_TYPE_P(object) == IS_ARRAY) {
                zval **data_ptr;