Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

UninstallExceptionHandler: Zero-initialize some structs. I've seen some weird crashes on the free() on Android.

Browse Source
This commit is contained in:
Henrik Rydgård 2020-08-10 21:54:49 +02:00
parent 48ba304a4a
commit b2d6eef65d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Common/ExceptionHandlerSetup.cpp
View File

@ -287,7 +287,7 @@ void InstallExceptionHandler(BadAccessHandler badAccessHandler) {
INFO_LOG(SYSTEM, "Installed exception handler");
g_badAccessHandler = badAccessHandler;
stack_t signal_stack;
stack_t signal_stack{};
#ifdef __FreeBSD__
signal_stack.ss_sp = (char*)malloc(SIGSTKSZ);
#else
@ -298,7 +298,7 @@ void InstallExceptionHandler(BadAccessHandler badAccessHandler) {
if (sigaltstack(&signal_stack, nullptr)) {
_assert_msg_(false, "sigaltstack failed");
}
struct sigaction sa;
struct sigaction sa{};
sa.sa_handler = nullptr;
sa.sa_sigaction = &sigsegv_handler;
sa.sa_flags = SA_SIGINFO;
@ -313,9 +313,10 @@ void UninstallExceptionHandler() {
if (!g_badAccessHandler) {
return;
}
stack_t signal_stack, old_stack;
stack_t signal_stack{};
stack_t old_stack{};
signal_stack.ss_flags = SS_DISABLE;
if (!sigaltstack(&signal_stack, &old_stack) && !(old_stack.ss_flags & SS_DISABLE)) {
if (0 == sigaltstack(&signal_stack, &old_stack) && !(old_stack.ss_flags & SS_DISABLE)) {
free(old_stack.ss_sp);
}
sigaction(SIGSEGV, &old_sa_segv, nullptr);