cvs: ZendEngine2(PHP_5_2) / zend_vm_def.h zend_vm_execute.h

lbarnaud		Sat May 30 16:35:30 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /ZendEngine2	zend_vm_def.h zend_vm_execute.h 
  Log:
  MFH: Fix aliasing issue (fixes #48409 , #48428 , #48228)
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.59.2.29.2.67&r2=1.59.2.29.2.68&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.59.2.29.2.67 ZendEngine2/zend_vm_def.h:1.59.2.29.2.68
--- ZendEngine2/zend_vm_def.h:1.59.2.29.2.67	Wed Apr  8 00:28:04 2009
+++ ZendEngine2/zend_vm_def.h	Sat May 30 16:35:26 2009
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_vm_def.h,v 1.59.2.29.2.67 2009/04/08 00:28:04 felipe Exp $ */
+/* $Id: zend_vm_def.h,v 1.59.2.29.2.68 2009/05/30 16:35:26 lbarnaud Exp $ */
 
 /* If you change this file, please regenerate the zend_vm_execute.h and
  * zend_vm_opcodes.h files by running:
@@ -2084,7 +2084,8 @@
 		EG(This) = current_this;
 		EG(scope) = current_scope;
 	}
-	zend_ptr_stack_2_pop(&EG(arg_types_stack), (void**)&EX(object), (void**)&EX(fbc));
+	EX(object) = zend_ptr_stack_pop(&EG(arg_types_stack));
+	EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));
 
 	zend_ptr_stack_clear_multiple(TSRMLS_C);
 
@@ -3856,7 +3857,8 @@
 			}
 			zval_ptr_dtor(&EX(object));
 		}
-		zend_ptr_stack_2_pop(&EG(arg_types_stack), (void**)&EX(object), (void**)&EX(fbc));
+		EX(object) = zend_ptr_stack_pop(&EG(arg_types_stack));
+		EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));
 	}
 
 	for (i=0; i<EX(op_array)->last_brk_cont; i++) {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.62.2.30.2.70&r2=1.62.2.30.2.71&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.62.2.30.2.70 ZendEngine2/zend_vm_execute.h:1.62.2.30.2.71
--- ZendEngine2/zend_vm_execute.h:1.62.2.30.2.70	Wed Apr  8 00:28:04 2009
+++ ZendEngine2/zend_vm_execute.h	Sat May 30 16:35:26 2009
@@ -302,7 +302,8 @@
 		EG(This) = current_this;
 		EG(scope) = current_scope;
 	}
-	zend_ptr_stack_2_pop(&EG(arg_types_stack), (void**)&EX(object), (void**)&EX(fbc));
+	EX(object) = zend_ptr_stack_pop(&EG(arg_types_stack));
+	EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));
 
 	zend_ptr_stack_clear_multiple(TSRMLS_C);
 
@@ -562,7 +563,8 @@
 			}
 			zval_ptr_dtor(&EX(object));
 		}
-		zend_ptr_stack_2_pop(&EG(arg_types_stack), (void**)&EX(object), (void**)&EX(fbc));
+		EX(object) = zend_ptr_stack_pop(&EG(arg_types_stack));
+		EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));
 	}
 
 	for (i=0; i<EX(op_array)->last_brk_cont; i++) {