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

dbghelp: Fix regression with prevented StackWalk on i386 CPU to be called with a NULL context.

Browse Source
This commit is contained in:
Eric Pouech 2010-09-11 12:14:59 +02:00 committed by Alexandre Julliard
parent ba5e809864
commit 1e12e90cc9
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/dbghelp/cpu_i386.c
View File

@ -108,6 +108,9 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO
WORD val; WORD val;
BOOL do_switch; BOOL do_switch;
unsigned deltapc = 1; unsigned deltapc = 1;
#ifdef __i386__
CONTEXT _context;
#endif
/* sanity check */ /* sanity check */
if (curr_mode >= stm_done) return FALSE; if (curr_mode >= stm_done) return FALSE;
@ -120,6 +123,21 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO
curr_mode == stm_start ? "start" : (curr_mode == stm_16bit ? "16bit" : "32bit"), curr_mode == stm_start ? "start" : (curr_mode == stm_16bit ? "16bit" : "32bit"),
(void*)(DWORD_PTR)curr_switch, (void*)(DWORD_PTR)next_switch); (void*)(DWORD_PTR)curr_switch, (void*)(DWORD_PTR)next_switch);
#ifdef __i386__
if (!context)
{
/* setup a pseudo context for the rest of the code (esp. unwinding) */
context = &_context;
memset(context, 0, sizeof(*context));
context->ContextFlags = CONTEXT_CONTROL | CONTEXT_SEGMENTS;
if (frame->AddrPC.Mode != AddrModeFlat) context->SegCs = frame->AddrPC.Segment;
context->Eip = frame->AddrPC.Offset;
if (frame->AddrFrame.Mode != AddrModeFlat) context->SegSs = frame->AddrFrame.Segment;
context->Ebp = frame->AddrFrame.Offset;
if (frame->AddrStack.Mode != AddrModeFlat) context->SegSs = frame->AddrStack.Segment;
context->Esp = frame->AddrStack.Offset;
}
#endif
if (curr_mode == stm_start) if (curr_mode == stm_start)
{ {
THREAD_BASIC_INFORMATION info; THREAD_BASIC_INFORMATION info;