From 1b893ea4bcd2498485eaa8577f8b6fb03416ea20 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Thu, 4 Dec 2008 15:50:48 +0000 Subject: [PATCH] - Fixed bug #46749 (Crash when repeatedly attempting to assign to property of non-object) --- Zend/zend_execute.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 5e515aa532..74ebb354b5 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -598,11 +598,6 @@ static inline void zend_assign_to_object(znode *result, zval **object_ptr, zval *retval = EG(uninitialized_zval_ptr); PZVAL_LOCK(*retval); } - if (value_op->op_type == IS_TMP_VAR) { - FREE_ZVAL(value); - } else if (value_op->op_type == IS_CONST) { - zval_ptr_dtor(&value); - } FREE_OP(free_value); return; } @@ -638,6 +633,11 @@ static inline void zend_assign_to_object(znode *result, zval **object_ptr, zval *retval = EG(uninitialized_zval_ptr); PZVAL_LOCK(*retval); } + if (value_op->op_type == IS_TMP_VAR) { + FREE_ZVAL(value); + } else if (value_op->op_type == IS_CONST) { + zval_ptr_dtor(&value); + } FREE_OP(free_value); return; } -- 2.50.1