Fixed bug #48004 (Error handler prevents creation of default object)

1 files changed, 2 insertions, 4 deletions

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index fb0e8fcd0b..1c7636476c 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -536,9 +536,9 @@ static inline void zend_assign_to_object(znode *result, zval **object_ptr, zval
 		    (Z_TYPE_P(object) == IS_BOOL && Z_LVAL_P(object) == 0) ||
 		    (Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0)) {
 			SEPARATE_ZVAL_IF_NOT_REF(object_ptr);
-			zval_dtor(object);
+			zval_dtor(*object_ptr);
+			object_init(*object_ptr);
 			object = *object_ptr;
-			object_init(object);
 			zend_error(E_STRICT, "Creating default object from empty value");
 		} else {
 			zend_error(E_WARNING, "Attempt to assign property of non-object");
@@ -551,8 +551,6 @@ static inline void zend_assign_to_object(znode *result, zval **object_ptr, zval
 		}
 	}
 	
-	/* here we are sure we are dealing with an object */
-
 	/* separate our value if necessary */
 	if (value_op->op_type == IS_TMP_VAR) {
 		zval *orig_value = value;