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

msvcrt: Fix crash when rethrowing after a non-C++ exception on x86_64.

Browse source
This commit is contained in:
Brendan Shanks 2023-04-20 14:39:42 -07:00 committed by Alexandre Julliard
parent 90cc094260
commit e414561a96
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/msvcrt/except_x86_64.c
View file

@ -579,14 +579,14 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
return ExceptionContinueSearch;
}
if (rec->ExceptionCode == CXX_EXCEPTION &&
(!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]))
{
TRACE("rethrow detected.\n");
*rec = *msvcrt_get_thread_data()->exc_record;
}
if (rec->ExceptionCode == CXX_EXCEPTION)
{
if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2])
{
TRACE("rethrow detected.\n");
*rec = *msvcrt_get_thread_data()->exc_record;
}
exc_type = (cxx_exception_type *)rec->ExceptionInformation[2];
if (TRACE_ON(seh))