cvs: ZendEngine2(PHP_5_3) / zend_vm_def.h zend_vm_execute.h
[email protected] ("Arnaud Le Blanc") Sat, 30 May 2009 16:31:18 -0000
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvslbarnaud1243701078@cvsserver> |
lbarnaud Sat May 30 16:31:18 2009 UTC
Modified files: (Branch: PHP_5_3)
/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.48.2.90&r2=1.59.2.29.2.48.2.91&diff_format=u
Index: ZendEngine2/zend_vm_def.h
diff -u ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.90 ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.91
--- ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.90 Wed Apr 8 13:19:34 2009
+++ ZendEngine2/zend_vm_def.h Sat May 30 16:31:12 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.90 2009/04/08 13:19:34 dmitry Exp $ */
+/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.91 2009/05/30 16:31:12 lbarnaud Exp $ */
/* If you change this file, please regenerate the zend_vm_execute.h and
* zend_vm_opcodes.h files by running:
@@ -2288,7 +2288,9 @@
EG(called_scope) = EX(called_scope);
}
- zend_ptr_stack_3_pop(&EG(arg_types_stack), (void*)&EX(called_scope), (void**)&EX(current_object), (void**)&EX(fbc));
+ EX(called_scope) = zend_ptr_stack_pop(&EG(arg_types_stack));
+ EX(current_object) = zend_ptr_stack_pop(&EG(arg_types_stack));
+ EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));
EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);
if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
@@ -4296,7 +4298,8 @@
zval_ptr_dtor(&EX(object));
}
EX(called_scope) = DECODE_CTOR(EX(called_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));
}
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.49.2.90&r2=1.62.2.30.2.49.2.91&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.90 ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.91
--- ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.90 Wed Apr 8 13:19:34 2009
+++ ZendEngine2/zend_vm_execute.h Sat May 30 16:31:12 2009
@@ -290,7 +290,9 @@
EG(called_scope) = EX(called_scope);
}
- zend_ptr_stack_3_pop(&EG(arg_types_stack), (void*)&EX(called_scope), (void**)&EX(current_object), (void**)&EX(fbc));
+ EX(called_scope) = zend_ptr_stack_pop(&EG(arg_types_stack));
+ EX(current_object) = zend_ptr_stack_pop(&EG(arg_types_stack));
+ EX(fbc) = zend_ptr_stack_pop(&EG(arg_types_stack));
EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);
if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
@@ -636,7 +638,8 @@
zval_ptr_dtor(&EX(object));
}
EX(called_scope) = DECODE_CTOR(EX(called_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));
}
for (i=0; i<EX(op_array)->last_brk_cont; i++) {