From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 26 Dec 2005 08:21:29 +0000 (+0000)
Subject: Reverted invalid fix for bug #35785
X-Git-Tag: RELEASE_1_0_4~224
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39a540f75f5c729c1b7df02ac8cac35cc39168e1;p=php

Reverted invalid fix for bug #35785
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index a22d3915c0..dc4f2bd3f6 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -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)) {