- Fixed bug #46749 (Crash when repeatedly attempting to assign to property of non-object)

This commit is contained in:
Felipe Pena 2008-12-04 15:50:48 +00:00
parent 308d4fa79a
commit 1b893ea4bc

View File

@ -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;
}