]> granicus.if.org Git - php/commitdiff
be consistent with write_dimension
authorStanislav Malyshev <stas@php.net>
Wed, 14 Jul 2004 09:04:13 +0000 (09:04 +0000)
committerStanislav Malyshev <stas@php.net>
Wed, 14 Jul 2004 09:04:13 +0000 (09:04 +0000)
Zend/zend_object_handlers.c

index 4beb8df3c9cbb5c14006c88c0cab7b5a3a4fb161..7965bb0eb3f0ce96e5b3dc19db57d96823a909fb 100644 (file)
@@ -384,12 +384,11 @@ zval *zend_std_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
                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);