yuzu-emu/breakpad
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix crash when an NSException is thrown.

Browse source 
old_handlers is zeroish whenever an NSException is thrown. This caused PROT_WRITE to never be set and resulted in an EXC_BAD_ACCESS when trying to set the handler to NULL.

Change-Id: Ibb7da448204431c7602b1001f3a5216303c4c9d1
Reviewed-on: https://chromium-review.googlesource.com/899907
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Adam Harrison 2018-02-02 11:14:00 -08:00 committed by Mark Mentovai
parent ac4a549e29
commit 6bb6c9b26a
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/ios/Breakpad.mm
View file

@ -50,7 +50,7 @@
#if !TARGET_OS_TV && !TARGET_OS_WATCH #if !TARGET_OS_TV && !TARGET_OS_WATCH
#import "client/mac/handler/exception_handler.h" #import "client/mac/handler/exception_handler.h"
#else #else
#import "client/ios/handler/exception_handler_no_mach.h" #import "client/ios/exception_handler_no_mach.h"
#endif // !TARGET_OS_TV && !TARGET_OS_WATCH #endif // !TARGET_OS_TV && !TARGET_OS_WATCH
#if !defined(__EXCEPTIONS) || (__clang__ && !__has_feature(cxx_exceptions)) #if !defined(__EXCEPTIONS) || (__clang__ && !__has_feature(cxx_exceptions))

21
src/client/ios/exception_handler_no_mach.cc
View file

@ -31,7 +31,7 @@
#include <TargetConditionals.h> #include <TargetConditionals.h>
#include "client/mac/handler/minidump_generator.h" #include "client/mac/handler/minidump_generator.h"
#include "client/ios/handler/exception_handler_no_mach.h" #include "client/ios/exception_handler_no_mach.h"
#ifndef USE_PROTECTED_ALLOCATIONS #ifndef USE_PROTECTED_ALLOCATIONS
#if TARGET_OS_TV #if TARGET_OS_TV
@ -200,8 +200,6 @@ bool ExceptionHandler::InstallHandlers() {
// If a handler is already installed, something is really wrong. // If a handler is already installed, something is really wrong.
if (gProtectedData.handler != NULL) { if (gProtectedData.handler != NULL) {
return false; return false;
}
gProtectedData.handler = this;
for (int i = 0; i < kNumHandledSignals; ++i) { for (int i = 0; i < kNumHandledSignals; ++i) {
struct sigaction sa; struct sigaction sa;
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
@ -213,11 +211,12 @@ bool ExceptionHandler::InstallHandlers() {
if (sigaction(kExceptionSignals[i], &sa, old_handlers[i].get()) == -1) { if (sigaction(kExceptionSignals[i], &sa, old_handlers[i].get()) == -1) {
return false; return false;
} }
#if USE_PROTECTED_ALLOCATIONS
assert(((size_t)(gProtectedData.protected_buffer) & PAGE_MASK) == 0);
mprotect(gProtectedData.protected_buffer, PAGE_SIZE, PROT_READ);
#endif // USE_PROTECTED_ALLOCATIONS
} }
gProtectedData.handler = this;
#if USE_PROTECTED_ALLOCATIONS
assert(((size_t)(gProtectedData.protected_buffer) & PAGE_MASK) == 0);
mprotect(gProtectedData.protected_buffer, PAGE_SIZE, PROT_READ);
#endif // USE_PROTECTED_ALLOCATIONS
installed_exception_handler_ = true; installed_exception_handler_ = true;
return true; return true;
} }
@ -226,13 +225,13 @@ bool ExceptionHandler::UninstallHandlers() {
for (int i = 0; i < kNumHandledSignals; ++i) { for (int i = 0; i < kNumHandledSignals; ++i) {
if (old_handlers[i].get()) { if (old_handlers[i].get()) {
sigaction(kExceptionSignals[i], old_handlers[i].get(), NULL); sigaction(kExceptionSignals[i], old_handlers[i].get(), NULL);
#if USE_PROTECTED_ALLOCATIONS
mprotect(gProtectedData.protected_buffer, PAGE_SIZE, PROT_READ | PROT_WRITE);
#endif // USE_PROTECTED_ALLOCATIONS
old_handlers[i].reset(); old_handlers[i].reset();
} }
gProtectedData.handler = NULL;
} }
#if USE_PROTECTED_ALLOCATIONS
mprotect(gProtectedData.protected_buffer, PAGE_SIZE, PROT_READ | PROT_WRITE);
#endif // USE_PROTECTED_ALLOCATIONS
gProtectedData.handler = NULL;
installed_exception_handler_ = false; installed_exception_handler_ = false;
return true; return true;
} }