msvcrt: Register exception object before unwinding.

Thrown object was incorrectly freed in following situation: try { try { throw obj; } catch(...) { throw; } } catch(...) { //use object here } Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Register exception object before unwinding.
3a0b3c5b · Piotr Caban · Alexandre Julliard · fdcdbf30 · 3a0b3c5b
Commit 3a0b3c5b authored Mar 21, 2016 by Piotr Caban Committed by Alexandre Julliard Mar 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

except_i386.c dlls/msvcrt/except_i386.c +2 -2

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

+            __CxxRegisterExceptionObject(&rec, &nested_frame.frame_info);
+
            /* unwind the stack */
            RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 );
            cxx_local_unwind( frame, descr, tryblock->start_level );
@@ -457,12 +459,10 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame 
                   catchblock, catchblock->handler, &frame->ebp );

            /* setup an exception block for nested exceptions */
-
            nested_frame.frame.Handler = catch_function_nested_handler;
            nested_frame.cxx_frame = frame;
            nested_frame.descr     = descr;
            nested_frame.trylevel  = nested_trylevel + 1;
-            __CxxRegisterExceptionObject(&rec, &nested_frame.frame_info);

            __wine_push_frame( &nested_frame.frame );
            addr = call_ebp_func( catchblock->handler, &frame->ebp );