Skip to content

W
wine-winehq
Commit 916c4b6b authored by Peter Beutner's avatar Peter Beutner Committed by Alexandre Julliard
Browse files
Options

msvcrt: Remove bogus code.

We can't just pop a exception record from the exception handler list which we haven't put there.
parent 58d3f145
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
dlls/msvcrt/cppexcept.c
View file @ 916c4b6b
...@@ -259,7 +259,7 @@ inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame ...@@ -259,7 +259,7 @@ inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame
{ {
UINT i; UINT i;
int j; int j;
void *addr, *prev_frame, *object = (void *)rec->ExceptionInformation[1]; void *addr, *object = (void *)rec->ExceptionInformation[1];
struct catch_func_nested_frame nested_frame; struct catch_func_nested_frame nested_frame;
int trylevel = frame->trylevel; int trylevel = frame->trylevel;
thread_data_t *thread_data = msvcrt_get_thread_data(); thread_data_t *thread_data = msvcrt_get_thread_data();
...@@ -318,8 +318,7 @@ inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame ...@@ -318,8 +318,7 @@ inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame
if (info && info->destructor) call_dtor( info->destructor, object ); if (info && info->destructor) call_dtor( info->destructor, object );
TRACE( "done, continuing at %p\n", addr ); TRACE( "done, continuing at %p\n", addr );
prev_frame = NtCurrentTeb()->Tib.ExceptionList;
__wine_pop_frame( prev_frame );
continue_after_catch( frame, addr ); continue_after_catch( frame, addr );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment