Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
8468a3ed
Commit
8468a3ed
authored
Oct 02, 2020
by
Piotr Caban
Committed by
Alexandre Julliard
Oct 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcrt: Terminate on noexcept function trying to propagate exception (x86_64).
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
26c1f8fb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
1 deletion
+18
-1
except_x86_64.c
dlls/msvcrt/except_x86_64.c
+18
-1
No files found.
dlls/msvcrt/except_x86_64.c
View file @
8468a3ed
...
...
@@ -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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment