commit b971745ca01700cb3832b3fae8d3cd36fe582480
author Eric Pouech <Eric.Pouech@wanadoo.fr> Fri May 05 18:14:34 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri May 05 18:14:34 2000 +0000
tree 48b7b36fca181b6c6df9dde990d5b9245e3a81cb
parent 47bea26a2a33b8b331e6e6d3c65ef4e229d12867

Fixed some buffer overflows.
Made stab parsing more robust (now ignores C++ stabs).
Display correct backtrace at first when invoked on unhandled exception.
Loads stabs from .so files when those are loaded.

debugger/break.c

diff --git a/debugger/break.c b/debugger/break.c
index ad383f5..338a737 100644
--- a/debugger/break.c
+++ b/debugger/break.c
@@ -178,7 +178,7 @@
       case DBG_BREAK:
 	 {
 #ifdef __i386__
-	    char ch = set ? INT3 : breakpoints[i].u.opcode;
+	    char ch = set ? INT3 : breakpoints[i].u.b.opcode;
 #endif
 	    
 	    if (!DEBUG_WRITE_MEM( (void*)DEBUG_ToLinear(&breakpoints[i].addr), 
@@ -322,7 +322,7 @@
  *
  * Add a breakpoint.
  */
-void DEBUG_AddBreakpoint( const DBG_VALUE *_value )
+void DEBUG_AddBreakpoint( const DBG_VALUE *_value, BOOL (*func)(void) )
 {
     DBG_VALUE value = *_value;
     int num;
@@ -358,7 +358,8 @@
     if ((num = DEBUG_InitXPoint(DBG_BREAK, &value.addr)) == -1)
        return;
 
-    breakpoints[num].u.opcode  = ch;
+    breakpoints[num].u.b.opcode = ch;
+    breakpoints[num].u.b.func = func;
 
     DEBUG_Printf( DBG_CHN_MESG, "Breakpoint %d at ", num );
     DEBUG_PrintAddress( &breakpoints[num].addr, breakpoints[num].is32 ? 32 : 16,
@@ -628,7 +629,7 @@
    if ( breakpoints[bpnum].skipcount > 0 && --breakpoints[bpnum].skipcount > 0 )
       return FALSE;
 
-   return TRUE;
+   return (breakpoints[bpnum].u.b.func) ? (breakpoints[bpnum].u.b.func)() : TRUE;
 }
 
 /***********************************************************************
@@ -881,7 +882,7 @@
       breakpoints[0].enabled = TRUE;
       breakpoints[0].refcount = 1;
       breakpoints[0].skipcount = 0;
-      DEBUG_READ_MEM((void*)DEBUG_ToLinear( &addr ), &breakpoints[0].u.opcode, 
+      DEBUG_READ_MEM((void*)DEBUG_ToLinear( &addr ), &breakpoints[0].u.b.opcode, 
 		     sizeof(char));
       DEBUG_SetBreakpoints( TRUE );
       break;
@@ -899,7 +900,7 @@
             breakpoints[0].enabled = TRUE;
             breakpoints[0].refcount = 1;
 	    breakpoints[0].skipcount = 0;
-	    DEBUG_READ_MEM((void*)DEBUG_ToLinear( &addr ), &breakpoints[0].u.opcode, 
+	    DEBUG_READ_MEM((void*)DEBUG_ToLinear( &addr ), &breakpoints[0].u.b.opcode,
 			   sizeof(char));
             DEBUG_SetBreakpoints( TRUE );
             break;