cvs: ZendEngine2 / zend_execute.c

felipe		Thu Dec  4 15:50:49 2008 UTC

  Modified files:              
    /ZendEngine2	zend_execute.c 
  Log:
  - Fixed bug #46749 (Crash when repeatedly attempting to assign to property of non-object)
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.804&r2=1.805&diff_format=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.804 ZendEngine2/zend_execute.c:1.805
--- ZendEngine2/zend_execute.c:1.804	Fri Aug 15 19:45:25 2008
+++ ZendEngine2/zend_execute.c	Thu Dec  4 15:50:48 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute.c,v 1.804 2008/08/15 19:45:25 felipe Exp $ */
+/* $Id: zend_execute.c,v 1.805 2008/12/04 15:50:48 felipe Exp $ */
 
 #define ZEND_INTENSIVE_DEBUGGING 0
 
@@ -598,11 +598,6 @@
 				*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 @@
 				*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;
 		}