cvs: ZendEngine2 / zend_object_handlers.c

stas Wed Jul 14 05:04:14 2004 EDT Modified files: /ZendEngine2 zend_object_handlers.c Log: be consistent with write_dimension http://cvs.php.net/diff.php/ZendEngine2/zend_object_handlers.c?r1=1.100&r2=1.101&ty=u Index: ZendEngine2/zend_object_handlers.c diff -u ZendEngine2/zend_object_handlers.c:1.100 ZendEngine2/zend_object_handlers.c:1.101 --- ZendEngine2/zend_object_handlers.c:1.100 Wed Jul 14 05:01:58 2004 +++ ZendEngine2/zend_object_handlers.c Wed Jul 14 05:04:13 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_object_handlers.c,v 1.100 2004/07/14 09:01:58 stas Exp $ */ +/* $Id: zend_object_handlers.c,v 1.101 2004/07/14 09:04:13 stas Exp $ */ #include "zend.h" #include "zend_globals.h" @@ -384,12 +384,11 @@ if(offset == NULL) { /* [] construct */ zval offset_null; - ZVAL_NULL(&offset_null); - zend_call_method_with_1_params(&object, ce, NULL, "offsetget", &retval, &offset_null); - zval_dtor(&offset_null); /* just in case */ - } else { - zend_call_method_with_1_params(&object, ce, NULL, "offsetget", &retval, offset); + INIT_ZVAL(offset_null); + offset = &offset_null; } + zend_call_method_with_1_params(&object, ce, NULL, "offsetget", &retval, offset); + if (!retval) { if (!EG(exception)) { zend_error(E_ERROR, "Undefined offset for object of type %s used as array", ce->name);