apply correct fix for bug #38461

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 6d6b0e61fec36dde7b817ae1004c2f4532929058..96bdc87ee323c044646ee56d5fc5a4cf1b612ef6 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -415,7 +415,7 @@ static void zend_std_write_property(zval *object, zval *member, zval *value TSRM
                                zval_ptr_dtor(&garbage);
                        }
                }
-       } else if (property_info) {
+       } else {
                int setter_done = 0;
                zend_guard *guard;
 
@@ -429,7 +429,7 @@ static void zend_std_write_property(zval *object, zval *member, zval *value TSRM
                        setter_done = 1;
                        guard->in_set = 0;
                }
-               if (!setter_done) {
+               if (!setter_done && property_info) {
                        zval **foo;
 
                        /* if we assign referenced variable, we should separate it */