ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Save esp before calling catch block and restore afterwards. 

It seems like the esp value (which is saved at [ebp-16]) is sometimes
changed inside the catch handler so we end up with a bogus esp
afterwards.  To avoid that save it before calling the catch block.
This commit is contained in:
Peter Beutner 2006-02-22 12:21:00 +01:00 committed by Alexandre Julliard
parent be07b6db59
commit 82818284c3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcrt/cppexcept.c
View File

@ -285,6 +285,7 @@ inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame
struct catch_func_nested_frame nested_frame;
int trylevel = frame->trylevel;
thread_data_t *thread_data = msvcrt_get_thread_data();
DWORD save_esp = ((DWORD*)frame)[-1];
for (i = 0; i < descr->tryblock_count; i++)
{
@ -339,6 +340,7 @@ inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame
thread_data->exc_record = nested_frame.prev_rec;
__wine_pop_frame( &nested_frame.frame );
((DWORD*)frame)[-1] = save_esp;
if (info && info->destructor) call_dtor( info->destructor, object );
TRACE( "done, continuing at %p\n", addr );