vcruntime140_1: Use return address from catch block routine if not provided by catch block info.

Signed-off-by: Daniel Lehman <dlehman25@gmail.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

vcruntime140_1: Use return address from catch block routine if not provided by catch block info.
2f5ea323 · Daniel Lehman · Alexandre Julliard · cfa42821 · 2f5ea323
Commit 2f5ea323 authored May 21, 2020 by Daniel Lehman Committed by Alexandre Julliard May 22, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

except_x86_64.c dlls/vcruntime140_1/except_x86_64.c +2 -1

No files found.
--- a/dlls/vcruntime140_1/except_x86_64.c
+++ b/dlls/vcruntime140_1/except_x86_64.c
@@ -603,7 +603,8 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context,
                (ULONG_PTR)rva_to_ptr(ci.handler, dispatch->ImageBase);
            catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec;
            catch_record.ExceptionInformation[7] = (ULONG_PTR)context;
-            catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr(
+            if (ci.ret_addr)
+                catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr(
                    ci.ret_addr + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase);
            RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &ctx, NULL);
        }