Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Exception: Don't trust sigaltstack().

Browse source 
Let's just track our allocation separately and free it, always.
This commit is contained in:
Unknown W. Brackets 2020-08-26 21:44:38 -07:00
parent a8059d53f9
commit 90344fdee5
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Common/ExceptionHandlerSetup.cpp
View file

@ -21,6 +21,7 @@
#include "Common/MachineContext.h"
static BadAccessHandler g_badAccessHandler;
static void *altStack = nullptr;
#ifdef MACHINE_CONTEXT_SUPPORTED
@ -287,10 +288,11 @@ void InstallExceptionHandler(BadAccessHandler badAccessHandler) {
g_badAccessHandler = badAccessHandler;
stack_t signal_stack{};
altStack = malloc(SIGSTKSZ);
#ifdef __FreeBSD__
signal_stack.ss_sp = (char*)malloc(SIGSTKSZ);
signal_stack.ss_sp = (char*)altStack;
#else
signal_stack.ss_sp = malloc(SIGSTKSZ);
signal_stack.ss_sp = altStack;
#endif
signal_stack.ss_size = SIGSTKSZ;
signal_stack.ss_flags = 0;
@ -300,7 +302,7 @@ void InstallExceptionHandler(BadAccessHandler badAccessHandler) {
struct sigaction sa{};
sa.sa_handler = nullptr;
sa.sa_sigaction = &sigsegv_handler;
sa.sa_flags = SA_SIGINFO;
sa.sa_flags = SA_SIGINFO | SA_ONSTACK;
sigemptyset(&sa.sa_mask);
sigaction(SIGSEGV, &sa, &old_sa_segv);
#ifdef __APPLE__
@ -313,10 +315,13 @@ void UninstallExceptionHandler() {
return;
}
stack_t signal_stack{};
stack_t old_stack{};
signal_stack.ss_flags = SS_DISABLE;
if (0 == sigaltstack(&signal_stack, &old_stack) && !(old_stack.ss_flags & SS_DISABLE)) {
free(old_stack.ss_sp);
if (0 != sigaltstack(&signal_stack, nullptr)) {
ERROR_LOG(SYSTEM, "Could not remove signal altstack");
}
if (altStack) {
free(altStack);
altStack = nullptr;
}
sigaction(SIGSEGV, &old_sa_segv, nullptr);
#ifdef __APPLE__