Patch exception.diff for Scripting Engine problem Bug #64966
Patch version 2013-06-07 19:53 UTC
Return to Bug #64966 |
Download this patch
Patch Revisions:
Developer: bfrance@php.net
--- Zend/zend_vm_def.h.orig 2013-06-07 19:43:03.388289932 +0000
+++ Zend/zend_vm_def.h 2013-06-07 19:44:02.948273490 +0000
@@ -2301,6 +2301,7 @@
EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);
if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
+ ALLOC_INIT_ZVAL(EX_T(opline->result.u.var).var.ptr);
if (EX(function_state).function->common.arg_info) {
zend_uint i=0;
zval **p = (zval**)EX(function_state).arguments;
@@ -2313,7 +2314,6 @@
}
if (EXPECTED(EG(exception) == NULL)) {
- ALLOC_INIT_ZVAL(EX_T(opline->result.u.var).var.ptr);
EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
EX_T(opline->result.u.var).var.fcall_returned_reference = EX(function_state).function->common.return_reference;
--- Zend/zend_vm_execute.h.orig 2013-06-07 19:43:15.455668137 +0000
+++ Zend/zend_vm_execute.h 2013-06-07 19:43:51.723264859 +0000
@@ -301,6 +301,7 @@
EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);
if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
+ ALLOC_INIT_ZVAL(EX_T(opline->result.u.var).var.ptr);
if (EX(function_state).function->common.arg_info) {
zend_uint i=0;
zval **p = (zval**)EX(function_state).arguments;
@@ -313,7 +314,6 @@
}
if (EXPECTED(EG(exception) == NULL)) {
- ALLOC_INIT_ZVAL(EX_T(opline->result.u.var).var.ptr);
EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
EX_T(opline->result.u.var).var.fcall_returned_reference = EX(function_state).function->common.return_reference;
|