Daniel Lehman : vcruntime140_1: Skip unwind if already at last level.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 94b25a47ba1c92eeb987a1ed6d251a12ce9a30e8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=94b25a47ba1c92eeb987a1ed6...

Author: Daniel Lehman <dlehman25(a)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(a)gmail.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)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++)