From: Antony Dovgal <tony2001@php.net>
Date: Tue, 15 Aug 2006 20:30:42 +0000 (+0000)
Subject: apply correct fix for bug #38461
X-Git-Tag: php-5.2.0RC2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be316018fdc2785aa8cc3416f7ca117969f3c4c9;p=php

apply correct fix for bug #38461
---

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 6d6b0e61fe..96bdc87ee3 100644
--- 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 */