From b2d6eef65d7a4c2215b1dad48f736ad80635a649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Mon, 10 Aug 2020 21:54:49 +0200
Subject: [PATCH] UninstallExceptionHandler: Zero-initialize some structs. I've
 seen some weird crashes on the free() on Android.

---
 Common/ExceptionHandlerSetup.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Common/ExceptionHandlerSetup.cpp b/Common/ExceptionHandlerSetup.cpp
index b73bcbdc44..f886a5b6da 100644
--- a/Common/ExceptionHandlerSetup.cpp
+++ b/Common/ExceptionHandlerSetup.cpp
@@ -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);