diff options
Diffstat (limited to 'src/Main/FatalErrorHandler.cpp')
| -rw-r--r-- | src/Main/FatalErrorHandler.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/Main/FatalErrorHandler.cpp b/src/Main/FatalErrorHandler.cpp index 37a10e73..5e391698 100644 --- a/src/Main/FatalErrorHandler.cpp +++ b/src/Main/FatalErrorHandler.cpp @@ -3,9 +3,9 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. Modifications and additions to the original source code (contained in this file) - and all other portions of this file are Copyright (c) 2013-2016 IDRIX + and all other portions of this file are Copyright (c) 2013-2017 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source code distribution packages. */ @@ -24,9 +24,9 @@ #endif #ifdef TC_MACOSX # include <sys/ucontext.h> -#elif defined (TC_BSD) +#elif defined (TC_BSD) && !defined (TC_OPENBSD) # include <ucontext.h> #endif #include "FatalErrorHandler.h" @@ -55,11 +55,15 @@ namespace VeraCrypt #elif defined (TC_MACOSX) # ifdef __x86_64__ faultingInstructionAddress = context->uc_mcontext->__ss.__rip; +# else +# ifdef __aarch64__ + faultingInstructionAddress = context->uc_mcontext->__ss.__pc; # else faultingInstructionAddress = context->uc_mcontext->__ss.__eip; # endif +# endif #endif wstringstream vars; @@ -68,9 +72,9 @@ namespace VeraCrypt vars << L"&err=" << signalInfo->si_signo; vars << L"&addr=" << hex << faultingInstructionAddress << dec; vars << FatalErrorHandler::GetCallStack (16); - wxString url = Gui->GetHomepageLinkURL (L"err-report", true, vars.str()); + wxString url = Gui->GetHomepageLinkURL (L"err-report", vars.str()); url.Replace (L"=0x", L"="); url.Replace (L"=0X0x", L"=0x"); url.Replace (L"=0X", L"=0x"); @@ -211,9 +215,9 @@ namespace VeraCrypt vars.Replace (L"::", L"."); vars.Replace (L":", L"."); - wxString url = Gui->GetHomepageLinkURL (L"err-report", true, vars); + wxString url = Gui->GetHomepageLinkURL (L"err-report", vars); url.Replace (L"=0x", L"="); url.Replace (L"=0X0x", L"=0x"); url.Replace (L"=0X", L"=0x"); @@ -242,9 +246,9 @@ namespace VeraCrypt Gui->ShowError (e); } catch (...) { - Gui->ShowError (_("Unknown exception occurred.")); + Gui->ShowError (LangString["LINUX_UNKNOWN_EXC_OCCURRED"]); } _exit (1); } |