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

msvcrt: Terminate on noexcept function trying to propagate exception (x86_64).

Browse source 
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-10-02 22:27:20 +02:00 committed by Alexandre Julliard
parent 26c1f8fb07
commit 8468a3ed77
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dlls/msvcrt/except_x86_64.c
View file

@ -499,6 +499,18 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c)
return ExceptionContinueSearch;
}
static void check_noexcept( PEXCEPTION_RECORD rec,
const cxx_function_descr *descr, BOOL nested )
{
if (!nested && rec->ExceptionCode == CXX_EXCEPTION &&
descr->magic >= CXX_FRAME_MAGIC_VC8 &&
(descr->flags & FUNC_DESCR_NOEXCEPT))
{
ERR("noexcept function propagating exception\n");
MSVCRT_terminate();
}
}
static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
CONTEXT *context, DISPATCHER_CONTEXT *dispatch,
const cxx_function_descr *descr)
@ -562,7 +574,11 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
cxx_local_unwind(orig_frame, dispatch, descr, unwindlevel);
return ExceptionContinueSearch;
}
if (!descr->tryblock_count) return ExceptionContinueSearch;
if (!descr->tryblock_count)
{
check_noexcept(rec, descr, orig_frame != frame);
return ExceptionContinueSearch;
}
if (rec->ExceptionCode == CXX_EXCEPTION)
{
@ -612,6 +628,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
}
find_catch_block(rec, context, NULL, frame, dispatch, descr, exc_type, orig_frame);
check_noexcept(rec, descr, orig_frame != frame);
return ExceptionContinueSearch;
}