summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-03-11 16:54:51 +0800
committerXinchen Hui <laruence@php.net>2015-03-11 16:54:51 +0800
commit80274290b7107a8171806967dd098047f183b008 (patch)
treef79a7178e526d8cfecc5e08b2c1fe37a43cd1e28
parent70f4854028eeca1e4232b2a805a015ed1c5d7b1c (diff)
downloadphp-git-80274290b7107a8171806967dd098047f183b008.tar.gz
Comment out for now
-rw-r--r--Zend/zend_vm_def.h3
-rw-r--r--Zend/zend_vm_execute.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 5994380a7e..9714cf7ad3 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3241,6 +3241,8 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY)
EG(current_execute_data) = call->prev_execute_data;
} else {
zend_error(E_EXCEPTION | E_ERROR, "Cannot call overloaded function for non-object");
+#if 0
+ //TODO: implement clean exit ???
zend_vm_stack_free_args(call);
zend_vm_stack_free_call_frame(call);
@@ -3249,6 +3251,7 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY)
zend_string_release(fbc->common.function_name);
}
efree(fbc);
+#endif
HANDLE_EXCEPTION();
}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index c3bf80d2bb..66cbf0453a 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -807,6 +807,8 @@ static int ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
EG(current_execute_data) = call->prev_execute_data;
} else {
zend_error(E_EXCEPTION | E_ERROR, "Cannot call overloaded function for non-object");
+#if 0
+ //TODO: implement clean exit ???
zend_vm_stack_free_args(call);
zend_vm_stack_free_call_frame(call);
@@ -815,6 +817,7 @@ static int ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
zend_string_release(fbc->common.function_name);
}
efree(fbc);
+#endif
HANDLE_EXCEPTION();
}