[PATCH] msvcrt: remove bogus code
Peter Beutner
p.beutner at gmx.net
Fri Feb 17 04:45:28 CST 2006
We can't just pop a exception record from the exception handler list which
we haven't put there.
fixes bug #4493
---
dlls/msvcrt/cppexcept.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
9d2c7bd964ad0148735e87814cf24520009acbcc
diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c
index 29d7b58..073674a 100644
--- a/dlls/msvcrt/cppexcept.c
+++ b/dlls/msvcrt/cppexcept.c
@@ -259,7 +259,7 @@ inline static void call_catch_block( PEX
{
UINT i;
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;
int trylevel = frame->trylevel;
thread_data_t *thread_data = msvcrt_get_thread_data();
@@ -318,8 +318,7 @@ inline static void call_catch_block( PEX
if (info && info->destructor) call_dtor( info->destructor, object );
TRACE( "done, continuing at %p\n", addr );
- prev_frame = NtCurrentTeb()->Tib.ExceptionList;
- __wine_pop_frame( prev_frame );
+
continue_after_catch( frame, addr );
}
}
--
1.2.0
More information about the wine-patches
mailing list