system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 08:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

msvcrt: Reset a signal to DFL before it's used.

Browse source
This commit is contained in:
Eric Pouech 2007-02-08 21:33:33 +01:00 committed by Alexandre Julliard
parent 1f5e5a2b75
commit 9f309b32e6
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
dlls/msvcrt/except.c
View file

@ -429,6 +429,7 @@ static const struct
static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except)
{
LONG ret = EXCEPTION_CONTINUE_SEARCH;
MSVCRT___sighandler_t handler;
if (!except || !except->ExceptionRecord)
return EXCEPTION_CONTINUE_SEARCH;
@ -436,10 +437,13 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except)
switch (except->ExceptionRecord->ExceptionCode)
{
case EXCEPTION_ACCESS_VIOLATION:
if (sighandlers[MSVCRT_SIGSEGV])
if ((handler = sighandlers[MSVCRT_SIGSEGV]) != MSVCRT_SIG_DFL)
{
if (sighandlers[MSVCRT_SIGSEGV] != MSVCRT_SIG_IGN)
sighandlers[MSVCRT_SIGSEGV](MSVCRT_SIGSEGV);
if (handler != MSVCRT_SIG_IGN)
{
sighandlers[MSVCRT_SIGSEGV] = MSVCRT_SIG_DFL;
handler(MSVCRT_SIGSEGV);
}
ret = EXCEPTION_CONTINUE_EXECUTION;
}
break;
@ -455,31 +459,36 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except)
case EXCEPTION_FLT_OVERFLOW:
case EXCEPTION_FLT_STACK_CHECK:
case EXCEPTION_FLT_UNDERFLOW:
if (sighandlers[MSVCRT_SIGFPE])
if ((handler = sighandlers[MSVCRT_SIGFPE]) != MSVCRT_SIG_DFL)
{
if (sighandlers[MSVCRT_SIGFPE] != MSVCRT_SIG_IGN)
if (handler != MSVCRT_SIG_IGN)
{
int i, float_signal = _FPE_INVALID;
float_handler handler = (float_handler)sighandlers[MSVCRT_SIGFPE];
sighandlers[MSVCRT_SIGFPE] = MSVCRT_SIG_DFL;
for (i = 0; i < sizeof(float_exception_map) /
sizeof(float_exception_map[0]); i++)
sizeof(float_exception_map[0]); i++)
{
if (float_exception_map[i].status ==
except->ExceptionRecord->ExceptionCode)
except->ExceptionRecord->ExceptionCode)
{
float_signal = float_exception_map[i].signal;
break;
}
handler(MSVCRT_SIGFPE, float_signal);
}
((float_handler)handler)(MSVCRT_SIGFPE, float_signal);
}
ret = EXCEPTION_CONTINUE_EXECUTION;
}
break;
case EXCEPTION_ILLEGAL_INSTRUCTION:
if (sighandlers[MSVCRT_SIGILL])
if ((handler = sighandlers[MSVCRT_SIGILL]) != MSVCRT_SIG_DFL)
{
if (sighandlers[MSVCRT_SIGILL] != MSVCRT_SIG_IGN)
sighandlers[MSVCRT_SIGILL](MSVCRT_SIGILL);
if (handler != MSVCRT_SIG_IGN)
{
sighandlers[MSVCRT_SIGILL] = MSVCRT_SIG_DFL;
handler(MSVCRT_SIGILL);
}
ret = EXCEPTION_CONTINUE_EXECUTION;
}
break;