From 56d78654a3cd5b68c3da11ac3008e8d8f5f8ae80 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 26 Dec 2005 08:18:38 +0000 Subject: [PATCH] Reverted invalid fix for bug #35785 --- NEWS | 1 - Zend/zend_execute.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 32fc541bd2..f24da336e5 100644 --- a/NEWS +++ b/NEWS @@ -3,7 +3,6 @@ PHP NEWS ?? Jan 2006, PHP 5.1.2RC2 - Fixed small leak in mysqli_stmt_fetch() when bound variable was empty string. (Andrey) -- Fixed bug #35785 (SimpleXML causes memory read error zend engine). (Marcus) - Fixed bug #35781 (stream_filter_append() can cause segfault). (Tony) - Fixed bug #35759 (mysqli_stmt_bind_result() makes huge allocation when column empty). (Andrey) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 0e39af6b17..8e1680d0a4 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -548,7 +548,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)) { -- 2.40.0