Reverted invalid fix for bug #35785

diff --git a/NEWS b/NEWS
index 32fc541bd298ef419cc7032ca7cc291d3f0cdefe..f24da336e588dc0b06de7e00587a5d78c079e426 100644 (file)
--- 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 0e39af6b1758aac1dfa8e9c56e8b890ca9948e8a..8e1680d0a4f747c412046fca464a23007b225f82 100644 (file)
--- 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)) {