commit 15ca6c43a9d729769f22ee55c29cc36fb5a47cc8
author Eric Pouech <Eric.Pouech@wanadoo.fr> Sat Apr 03 11:10:54 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Apr 03 11:10:54 1999 +0000
tree faa22d1d674a1b1fc0bb9b99e2ed8ae3ed0191ec
parent f585c61dd12263ddfb8b3b618ac352fdc30e5123

Prevent crash in debugger.

debugger/db_disasm.c

diff --git a/debugger/db_disasm.c b/debugger/db_disasm.c
index 62e121d..c7ad0e2 100644
--- a/debugger/db_disasm.c
+++ b/debugger/db_disasm.c
@@ -1036,15 +1036,22 @@
 	} 
 	else {
 
-	    /* try to get destination of indirect call)
-	       works not for segmented adresses */	
+	    /* try to get destination of indirect call
+	       does not work for segmented adresses */	
 	    if (!seg && byref) {
-	        DBG_ADDR dbg_addr = {0,0,*(LPDWORD)(addrp->disp)};
-	        fprintf(stderr,"0x%x -> ", addrp->disp);
-		if ( DEBUG_IsBadReadPtr( &dbg_addr, sizeof(DWORD)))
-		    fprintf(stderr, "(invalid destination)");
-		else 
-		    db_task_printsym(dbg_addr.off, 0);
+               DBG_ADDR dbg_addr = {NULL, 0, 0};
+
+               dbg_addr.off = addrp->disp;
+               fprintf(stderr,"0x%x -> ", addrp->disp);
+               if (DEBUG_IsBadReadPtr( &dbg_addr, sizeof(LPDWORD))) {
+                   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
 	       db_task_printsym(addrp->disp, size);