summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2006-08-15 20:30:42 +0000
committerAntony Dovgal <tony2001@php.net>2006-08-15 20:30:42 +0000
commitbe316018fdc2785aa8cc3416f7ca117969f3c4c9 (patch)
tree865935141078435803aa4e8f50f6bdfdb10b9248 /Zend
parent8dc61360c6a63ca7b34d8e26e74c78ec64c3d87d (diff)
downloadphp-git-be316018fdc2785aa8cc3416f7ca117969f3c4c9.tar.gz
apply correct fix for bug #38461
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_object_handlers.c4
1 files changed, 2 insertions, 2 deletions
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 */