thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partial revert "sdl/i_system.cpp: fix compiler errors"

Browse source 
This reverts commit bca2c8cb19.

The changes to I_ReportSignal introduced implicit calls to malloc.
malloc is not signal-safe.
This commit is contained in:
Eidolon 2023-11-19 10:38:19 -06:00
parent 6c678bf347
commit 2c50b6a41a
1 changed files with 36 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/sdl/i_system.cpp
View file

@ -25,8 +25,6 @@
#include <thread> #include <thread>
#include <fmt/format.h>
#include <signal.h> #include <signal.h>
#ifdef _WIN32 #ifdef _WIN32
@ -371,52 +369,61 @@ static void I_ShowErrorMessageBox(const char *messagefordevelopers, boolean dump
static void I_ReportSignal(int num, int coredumped) static void I_ReportSignal(int num, int coredumped)
{ {
//static char msg[] = "oh no! back to reality!\r\n"; //static char msg[] = "oh no! back to reality!\r\n";
auto report = [coredumped](std::string sigmsg) const char * sigmsg;
{ char msg[128];
if (coredumped)
{
sigmsg += " (core dumped)";
}
I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg.c_str());
I_ShowErrorMessageBox(sigmsg.c_str(),
#if defined (UNIXBACKTRACE)
true
#elif defined (_WIN32)
!M_CheckParm("-noexchndl")
#else
false
#endif
);
};
switch (num) switch (num)
{ {
// case SIGINT: // case SIGINT:
// report("SIGINT - interrupted"); // sigmsg = "SIGINT - interrupted";
// break; // break;
case SIGILL: case SIGILL:
report("SIGILL - illegal instruction - invalid function image"); sigmsg = "SIGILL - illegal instruction - invalid function image";
break; break;
case SIGFPE: case SIGFPE:
report("SIGFPE - mathematical exception"); sigmsg = "SIGFPE - mathematical exception";
break; break;
case SIGSEGV: case SIGSEGV:
report("SIGSEGV - segment violation"); sigmsg = "SIGSEGV - segment violation";
break; break;
// case SIGTERM: // case SIGTERM:
// report("SIGTERM - Software termination signal from kill"); // sigmsg = "SIGTERM - Software termination signal from kill";
// break; // break;
// case SIGBREAK: // case SIGBREAK:
// report("SIGBREAK - Ctrl-Break sequence"); // sigmsg = "SIGBREAK - Ctrl-Break sequence";
// break; // break;
case SIGABRT: case SIGABRT:
report("SIGABRT - abnormal termination triggered by abort call"); sigmsg = "SIGABRT - abnormal termination triggered by abort call";
break; break;
default: default:
report(fmt::format("signal number {}", num)); sprintf(msg,"signal number %d", num);
if (coredumped)
sigmsg = 0;
else
sigmsg = msg;
} }
if (coredumped)
{
if (sigmsg)
sprintf(msg, "%s (core dumped)", sigmsg);
else
strcat(msg, " (core dumped)");
sigmsg = msg;
}
I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
I_ShowErrorMessageBox(sigmsg,
#if defined (UNIXBACKTRACE)
true
#elif defined (_WIN32)
!M_CheckParm("-noexchndl")
#else
false
#endif
);
} }
#ifndef NEWSIGNALHANDLER #ifndef NEWSIGNALHANDLER