msvcrt: Fix i386 rethrown exceptions handling.

When __CxxRegisterExceptionObject was used and there was no catch_function_nested_handler frame to rewind nested_frame.frame_info.rec was incorrectly set to current exception. Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Fix i386 rethrown exceptions handling.
ee5e0659 · Piotr Caban · Alexandre Julliard · 8c00ee2a · ee5e0659 · ee5e0659
Commit ee5e0659 authored Apr 07, 2016 by Piotr Caban Committed by Alexandre Julliard Apr 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

except_i386.c dlls/msvcrt/except_i386.c +3 -1

msvcrt.h dlls/msvcrt/msvcrt.h +1 -0

No files found.
--- a/dlls/msvcrt/except_i386.c
+++ b/dlls/msvcrt/except_i386.c
@@ -447,7 +447,9 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame 
                TRACE("found catch(...) block\n");
            }

-            __CxxRegisterExceptionObject(&rec, &nested_frame.frame_info);
+            /* Add frame info here so exception is not freed inside RtlUnwind call */
+            _CreateFrameInfo(&nested_frame.frame_info.frame_info,
+                    (void*)rec->ExceptionInformation[1]);

            /* unwind the stack */
            RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 );

--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -217,6 +217,7 @@ typedef struct
    void *unk;
 } cxx_frame_info;

+frame_info* __cdecl _CreateFrameInfo(frame_info *fi, void *obj);
 BOOL __cdecl __CxxRegisterExceptionObject(EXCEPTION_RECORD**, cxx_frame_info*);
 void __cdecl __CxxUnregisterExceptionObject(cxx_frame_info*, BOOL);
 void CDECL __DestructExceptionObject(EXCEPTION_RECORD*);