Prevent crash in debugger.

This commit is contained in:
Eric Pouech 1999-04-03 11:10:54 +00:00 committed by Alexandre Julliard
parent f585c61dd1
commit 15ca6c43a9
1 changed files with 15 additions and 8 deletions

View File

@ -1036,15 +1036,22 @@ db_print_address(seg, size, addrp, byref)
} }
else { else {
/* try to get destination of indirect call) /* try to get destination of indirect call
works not for segmented adresses */ does not work for segmented adresses */
if (!seg && byref) { if (!seg && byref) {
DBG_ADDR dbg_addr = {0,0,*(LPDWORD)(addrp->disp)}; DBG_ADDR dbg_addr = {NULL, 0, 0};
fprintf(stderr,"0x%x -> ", addrp->disp);
if ( DEBUG_IsBadReadPtr( &dbg_addr, sizeof(DWORD))) dbg_addr.off = addrp->disp;
fprintf(stderr, "(invalid destination)"); fprintf(stderr,"0x%x -> ", addrp->disp);
else if (DEBUG_IsBadReadPtr( &dbg_addr, sizeof(LPDWORD))) {
db_task_printsym(dbg_addr.off, 0); fprintf(stderr, "(invalid source)");
} else {
dbg_addr.off = *(LPDWORD)(addrp->disp);
if (DEBUG_IsBadReadPtr( &dbg_addr, sizeof(DWORD)))
fprintf(stderr, "(invalid destination)");
else
db_task_printsym(dbg_addr.off, 0);
}
} }
else else
db_task_printsym(addrp->disp, size); db_task_printsym(addrp->disp, size);