Daniel Lehman : vcruntime140_1: Skip unwind if already at last level.
Alexandre Julliard
julliard at winehq.org
Wed Jun 3 16:40:56 CDT 2020
Module: wine
Branch: master
Commit: 94b25a47ba1c92eeb987a1ed6d251a12ce9a30e8
URL: https://source.winehq.org/git/wine.git/?a=commit;h=94b25a47ba1c92eeb987a1ed6d251a12ce9a30e8
Author: Daniel Lehman <dlehman25 at gmail.com>
Date: Wed Jun 3 11:09:19 2020 +0200
vcruntime140_1: Skip unwind if already at last level.
Signed-off-by: Daniel Lehman <dlehman25 at gmail.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/vcruntime140_1/except_x86_64.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c
index 48f824ae3f..42eab3b046 100644
--- a/dlls/vcruntime140_1/except_x86_64.c
+++ b/dlls/vcruntime140_1/except_x86_64.c
@@ -432,6 +432,8 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch,
terminate();
}
+ if (trylevel <= last_level) return;
+
unwind_data = rva_to_ptr(descr->unwind_map, dispatch->ImageBase);
last = unwind_data;
for (i = 0; i < trylevel; i++)
More information about the wine-cvs
mailing list