]> granicus.if.org Git - php/commitdiff
Reverted invalid fix for bug #35785
authorDmitry Stogov <dmitry@php.net>
Mon, 26 Dec 2005 08:21:29 +0000 (08:21 +0000)
committerDmitry Stogov <dmitry@php.net>
Mon, 26 Dec 2005 08:21:29 +0000 (08:21 +0000)
Zend/zend_execute.c

index a22d3915c0a2d2d7af6df778f7b674cb49ac7b89..dc4f2bd3f65d6c400d4908d65c3bdda1b8cee3a2 100644 (file)
@@ -572,7 +572,7 @@ static inline void zend_assign_to_object(znode *result, zval **object_ptr, znode
        make_real_object(object_ptr TSRMLS_CC); /* this should modify object only if it's empty */
        object = *object_ptr;
        
-       if (!object || object->type != IS_OBJECT || (opcode == ZEND_ASSIGN_OBJ && !Z_OBJ_HT_P(object)->write_property)) {
+       if (object->type != IS_OBJECT || (opcode == ZEND_ASSIGN_OBJ && !Z_OBJ_HT_P(object)->write_property)) {
                zend_error(E_WARNING, "Attempt to assign property of non-object");
                FREE_OP(free_op2);
                if (!RETURN_VALUE_UNUSED(result)) {