mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16572) -Codechange: also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing.

release/1.0
rubidium 2009-06-13 12:03:37 +00:00
parent 62f120b296
commit 2a7b07137a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/saveload/afterload.cpp
View File

@ -237,7 +237,8 @@ static bool InitializeWindowsAndCaches()
typedef void (CDECL *SignalHandlerPointer)(int); typedef void (CDECL *SignalHandlerPointer)(int);
static SignalHandlerPointer _prev_segfault = NULL; static SignalHandlerPointer _prev_segfault = NULL;
static SignalHandlerPointer _prev_abort = NULL; static SignalHandlerPointer _prev_abort = NULL;
static SignalHandlerPointer _prev_fpe = NULL;
static void CDECL HandleSavegameLoadCrash(int signum); static void CDECL HandleSavegameLoadCrash(int signum);
@ -248,7 +249,8 @@ static void CDECL HandleSavegameLoadCrash(int signum);
static void SetSignalHandlers() static void SetSignalHandlers()
{ {
_prev_segfault = signal(SIGSEGV, HandleSavegameLoadCrash); _prev_segfault = signal(SIGSEGV, HandleSavegameLoadCrash);
_prev_abort = signal(SIGABRT, HandleSavegameLoadCrash); _prev_abort = signal(SIGABRT, HandleSavegameLoadCrash);
_prev_fpe = signal(SIGFPE, HandleSavegameLoadCrash);
} }
/** /**
@ -258,6 +260,7 @@ static void ResetSignalHandlers()
{ {
signal(SIGSEGV, _prev_segfault); signal(SIGSEGV, _prev_segfault);
signal(SIGABRT, _prev_abort); signal(SIGABRT, _prev_abort);
signal(SIGFPE, _prev_fpe);
} }
/** /**
@ -300,7 +303,13 @@ static void CDECL HandleSavegameLoadCrash(int signum)
ShowInfo(buffer); ShowInfo(buffer);
SignalHandlerPointer call = signum == SIGSEGV ? _prev_segfault : _prev_abort; SignalHandlerPointer call = NULL;
switch (signum) {
case SIGSEGV: call = _prev_segfault; break;
case SIGABRT: call = _prev_abort; break;
case SIGFPE: call = _prev_fpe; break;
default: NOT_REACHED();
}
if (call != NULL) call(signum); if (call != NULL) call(signum);
} }