Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 12:12:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #82163 from naelstrof/master

Browse Source 
Made signal handling more uniform during crashes.
This commit is contained in:
Rémi Verschelde 2023-10-05 10:08:09 +02:00
commit d8ab953442
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/linuxbsd/crash_handler_linuxbsd.cpp
View File

@ -49,6 +49,10 @@
#include <stdlib.h> #include <stdlib.h>
static void handle_crash(int sig) { static void handle_crash(int sig) {
signal(SIGSEGV, SIG_DFL);
signal(SIGFPE, SIG_DFL);
signal(SIGILL, SIG_DFL);
if (OS::get_singleton() == nullptr) { if (OS::get_singleton() == nullptr) {
abort(); abort();
} }
@ -156,9 +160,9 @@ void CrashHandler::disable() {
} }
#ifdef CRASH_HANDLER_ENABLED #ifdef CRASH_HANDLER_ENABLED
signal(SIGSEGV, nullptr); signal(SIGSEGV, SIG_DFL);
signal(SIGFPE, nullptr); signal(SIGFPE, SIG_DFL);
signal(SIGILL, nullptr); signal(SIGILL, SIG_DFL);
#endif #endif
disabled = true; disabled = true;

10
platform/macos/crash_handler_macos.mm
View File

@ -72,6 +72,10 @@ static uint64_t load_address() {
} }
static void handle_crash(int sig) { static void handle_crash(int sig) {
signal(SIGSEGV, SIG_DFL);
signal(SIGFPE, SIG_DFL);
signal(SIGILL, SIG_DFL);
if (OS::get_singleton() == nullptr) { if (OS::get_singleton() == nullptr) {
abort(); abort();
} }
@ -186,9 +190,9 @@ void CrashHandler::disable() {
} }
#ifdef CRASH_HANDLER_ENABLED #ifdef CRASH_HANDLER_ENABLED
signal(SIGSEGV, nullptr); signal(SIGSEGV, SIG_DFL);
signal(SIGFPE, nullptr); signal(SIGFPE, SIG_DFL);
signal(SIGILL, nullptr); signal(SIGILL, SIG_DFL);
#endif #endif
disabled = true; disabled = true;