system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 14:17:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

dbghelp: When StackWalk fails to get any frame information, create a default one.

Browse source
This commit is contained in:
Eric Pouech 2012-01-03 21:37:49 +01:00 committed by Alexandre Julliard
parent ece423b858
commit 1ecef8242d
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
programs/winedbg/stack.c
View file

@ -192,6 +192,7 @@ unsigned stack_fetch_frames(const CONTEXT* _ctx)
* it to avoid any damage * it to avoid any damage
*/ */
CONTEXT ctx = *_ctx; CONTEXT ctx = *_ctx;
BOOL ret;
HeapFree(GetProcessHeap(), 0, dbg_curr_thread->frames); HeapFree(GetProcessHeap(), 0, dbg_curr_thread->frames);
dbg_curr_thread->frames = NULL; dbg_curr_thread->frames = NULL;
@ -208,11 +209,12 @@ unsigned stack_fetch_frames(const CONTEXT* _ctx)
sf.AddrFrame.Mode = AddrModeFlat; sf.AddrFrame.Mode = AddrModeFlat;
} }
while (StackWalk64(be_cpu->machine, dbg_curr_process->handle, while ((ret = StackWalk64(be_cpu->machine, dbg_curr_process->handle,
dbg_curr_thread->handle, &sf, &ctx, stack_read_mem, dbg_curr_thread->handle, &sf, &ctx, stack_read_mem,
SymFunctionTableAccess64, SymGetModuleBase64, NULL)) SymFunctionTableAccess64, SymGetModuleBase64, NULL)) ||
nf == 0) /* we always register first frame information */
{ {
dbg_curr_thread->frames = dbg_heap_realloc(dbg_curr_thread->frames, dbg_curr_thread->frames = dbg_heap_realloc(dbg_curr_thread->frames,
(nf + 1) * sizeof(dbg_curr_thread->frames[0])); (nf + 1) * sizeof(dbg_curr_thread->frames[0]));
dbg_curr_thread->frames[nf].addr_pc = sf.AddrPC; dbg_curr_thread->frames[nf].addr_pc = sf.AddrPC;
@ -230,8 +232,11 @@ unsigned stack_fetch_frames(const CONTEXT* _ctx)
(dbg_curr_thread->frames[nf - 1].is_ctx_valid && (dbg_curr_thread->frames[nf - 1].is_ctx_valid &&
memcmp(&dbg_curr_thread->frames[nf - 1].context, &ctx, sizeof(ctx)))); memcmp(&dbg_curr_thread->frames[nf - 1].context, &ctx, sizeof(ctx))));
nf++; nf++;
/* we've probably gotten ourselves into an infinite loop so bail */ /* bail if:
if (nf > 200) break; * - we've (probably) gotten ourselves into an infinite loop,
* - or StackWalk failed on first frame
*/
if (nf > 200 || !ret) break;
} }
dbg_curr_thread->curr_frame = -1; dbg_curr_thread->curr_frame = -1;
dbg_curr_thread->num_frames = nf; dbg_curr_thread->num_frames = nf;