cvs: ZendEngine2 / zend_object_handlers.c

tony2001                Tue Aug 15 20:30:26 2006 UTC

  Modified files:              
    /ZendEngine2        zend_object_handlers.c 
  Log:
  apply more correct fix for bug #38461
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_object_handlers.c?r1=1.174&r2=1.175&diff_format=u
Index: ZendEngine2/zend_object_handlers.c
diff -u ZendEngine2/zend_object_handlers.c:1.174 
ZendEngine2/zend_object_handlers.c:1.175
--- ZendEngine2/zend_object_handlers.c:1.174    Tue Aug 15 13:19:00 2006
+++ ZendEngine2/zend_object_handlers.c  Tue Aug 15 20:30:26 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_object_handlers.c,v 1.174 2006/08/15 13:19:00 tony2001 Exp $ */
+/* $Id: zend_object_handlers.c,v 1.175 2006/08/15 20:30:26 tony2001 Exp $ */
 
 #include "zend.h"
 #include "zend_globals.h"
@@ -420,7 +420,7 @@
                                zval_ptr_dtor(&garbage);
                        }
                }
-       } else if (property_info) {
+       } else {
                int setter_done = 0;
                zend_guard *guard;
 
@@ -434,7 +434,7 @@
                        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 */

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php