apply more correct fix for bug #38461

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 6e3c5bb06e1e9b3c27db024848ff8fcbddbb1512..6a0abb77b4413bc0c851b55b3c691bfa6f12b9db 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -420,7 +420,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;
 
@@ -434,7 +434,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 */