Skip to content

W
wine-cw
Commit b971745c authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

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.
parent 47bea26a
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 84 deletions
debugger/break.c
View file @ b971745c
...@@ -178,7 +178,7 @@ void DEBUG_SetBreakpoints( BOOL set ) ...@@ -178,7 +178,7 @@ void DEBUG_SetBreakpoints( BOOL set )
case DBG_BREAK: case DBG_BREAK:
{ {
#ifdef __i386__ #ifdef __i386__
char ch = set ? INT3 : breakpoints[i].u.opcode; char ch = set ? INT3 : breakpoints[i].u.b.opcode;
#endif #endif
if (!DEBUG_WRITE_MEM( (void*)DEBUG_ToLinear(&breakpoints[i].addr), if (!DEBUG_WRITE_MEM( (void*)DEBUG_ToLinear(&breakpoints[i].addr),
...@@ -322,7 +322,7 @@ static BOOL DEBUG_GetWatchedValue( int num, LPDWORD val ) ...@@ -322,7 +322,7 @@ static BOOL DEBUG_GetWatchedValue( int num, LPDWORD val )
* *
* Add a breakpoint. * Add a breakpoint.
*/ */
void DEBUG_AddBreakpoint( const DBG_VALUE *_value ) void DEBUG_AddBreakpoint( const DBG_VALUE *_value, BOOL (*func)(void) )
{ {
DBG_VALUE value = *_value; DBG_VALUE value = *_value;
int num; int num;
...@@ -358,7 +358,8 @@ void DEBUG_AddBreakpoint( const DBG_VALUE *_value ) ...@@ -358,7 +358,8 @@ void DEBUG_AddBreakpoint( const DBG_VALUE *_value )
if ((num = DEBUG_InitXPoint(DBG_BREAK, &value.addr)) == -1) if ((num = DEBUG_InitXPoint(DBG_BREAK, &value.addr)) == -1)
return; 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_Printf( DBG_CHN_MESG, "Breakpoint %d at ", num );
DEBUG_PrintAddress( &breakpoints[num].addr, breakpoints[num].is32 ? 32 : 16, DEBUG_PrintAddress( &breakpoints[num].addr, breakpoints[num].is32 ? 32 : 16,
...@@ -628,7 +629,7 @@ static BOOL DEBUG_ShallBreak( int bpnum ) ...@@ -628,7 +629,7 @@ static BOOL DEBUG_ShallBreak( int bpnum )
if ( breakpoints[bpnum].skipcount > 0 && --breakpoints[bpnum].skipcount > 0 ) if ( breakpoints[bpnum].skipcount > 0 && --breakpoints[bpnum].skipcount > 0 )
return FALSE; return FALSE;
return TRUE; return (breakpoints[bpnum].u.b.func) ? (breakpoints[bpnum].u.b.func)() : TRUE;
} }
/*********************************************************************** /***********************************************************************
...@@ -881,7 +882,7 @@ enum exec_mode DEBUG_RestartExecution( enum exec_mode mode, int count ) ...@@ -881,7 +882,7 @@ enum exec_mode DEBUG_RestartExecution( enum exec_mode mode, int count )
breakpoints[0].enabled = TRUE; breakpoints[0].enabled = TRUE;
breakpoints[0].refcount = 1; breakpoints[0].refcount = 1;
breakpoints[0].skipcount = 0; 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)); sizeof(char));
DEBUG_SetBreakpoints( TRUE ); DEBUG_SetBreakpoints( TRUE );
break; break;
...@@ -899,7 +900,7 @@ enum exec_mode DEBUG_RestartExecution( enum exec_mode mode, int count ) ...@@ -899,7 +900,7 @@ enum exec_mode DEBUG_RestartExecution( enum exec_mode mode, int count )
breakpoints[0].enabled = TRUE; breakpoints[0].enabled = TRUE;
breakpoints[0].refcount = 1; breakpoints[0].refcount = 1;
breakpoints[0].skipcount = 0; 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)); sizeof(char));
DEBUG_SetBreakpoints( TRUE ); DEBUG_SetBreakpoints( TRUE );
break; break;
......
debugger/dbg.y
View file @ b971745c
...@@ -197,12 +197,12 @@ print_command: ...@@ -197,12 +197,12 @@ print_command:
DEBUG_FreeExprMem(); } DEBUG_FreeExprMem(); }
break_command: break_command:
tBREAK '*' expr_addr tEOL { DEBUG_AddBreakpoint( &$3 ); tBREAK '*' expr_addr tEOL { DEBUG_AddBreakpoint( &$3, NULL );
DEBUG_FreeExprMem(); } DEBUG_FreeExprMem(); }
| tBREAK tIDENTIFIER tEOL { DBG_VALUE value; | tBREAK tIDENTIFIER tEOL { DBG_VALUE value;
if( DEBUG_GetSymbolValue($2, -1, &value, TRUE) ) if( DEBUG_GetSymbolValue($2, -1, &value, TRUE) )
{ {
DEBUG_AddBreakpoint( &value ); DEBUG_AddBreakpoint( &value, NULL );
} }
else else
{ {
...@@ -212,7 +212,7 @@ break_command: ...@@ -212,7 +212,7 @@ break_command:
| tBREAK tIDENTIFIER ':' tNUM tEOL { DBG_VALUE value; | tBREAK tIDENTIFIER ':' tNUM tEOL { DBG_VALUE value;
if( DEBUG_GetSymbolValue($2, $4, &value, TRUE) ) if( DEBUG_GetSymbolValue($2, $4, &value, TRUE) )
{ {
DEBUG_AddBreakpoint( &value ); DEBUG_AddBreakpoint( &value, NULL );
} }
else else
{ {
...@@ -229,7 +229,7 @@ break_command: ...@@ -229,7 +229,7 @@ break_command:
DEBUG_GetLineNumberAddr(nh, $2, &value.addr, TRUE); DEBUG_GetLineNumberAddr(nh, $2, &value.addr, TRUE);
value.type = NULL; value.type = NULL;
value.cookie = DV_TARGET; value.cookie = DV_TARGET;
DEBUG_AddBreakpoint( &value ); DEBUG_AddBreakpoint( &value, NULL );
} }
else else
{ {
...@@ -241,7 +241,7 @@ break_command: ...@@ -241,7 +241,7 @@ break_command:
DEBUG_GetCurrentAddress( &value.addr ); DEBUG_GetCurrentAddress( &value.addr );
value.type = NULL; value.type = NULL;
value.cookie = DV_TARGET; value.cookie = DV_TARGET;
DEBUG_AddBreakpoint( &value ); DEBUG_AddBreakpoint( &value, NULL );
} }
watch_command: watch_command:
......
debugger/debugger.h
View file @ b971745c
...@@ -115,8 +115,8 @@ enum exec_mode ...@@ -115,8 +115,8 @@ enum exec_mode
EXEC_KILL /* terminate debugging session */ EXEC_KILL /* terminate debugging session */
}; };
#define DBG_BREAK 0 #define DBG_BREAK 0
#define DBG_WATCH 1 #define DBG_WATCH 1
typedef struct typedef struct
{ {
...@@ -127,7 +127,10 @@ typedef struct ...@@ -127,7 +127,10 @@ typedef struct
refcount : 13; refcount : 13;
WORD skipcount; WORD skipcount;
union { union {
BYTE opcode; struct {
BYTE opcode;
BOOL (*func)(void);
} b;
struct { struct {
BYTE rw : 1, BYTE rw : 1,
len : 2; len : 2;
...@@ -158,7 +161,9 @@ typedef struct tagDBG_PROCESS { ...@@ -158,7 +161,9 @@ typedef struct tagDBG_PROCESS {
DWORD pid; DWORD pid;
DBG_THREAD* threads; DBG_THREAD* threads;
int num_threads; int num_threads;
unsigned continue_on_first_exception;
struct tagDBG_MODULE* modules; struct tagDBG_MODULE* modules;
unsigned long dbg_hdr_addr;
/* /*
* This is an index we use to keep track of the debug information * This is an index we use to keep track of the debug information
* when we have multiple sources. We use the same database to also * when we have multiple sources. We use the same database to also
...@@ -219,7 +224,7 @@ typedef struct { ...@@ -219,7 +224,7 @@ typedef struct {
/* debugger/break.c */ /* debugger/break.c */
extern void DEBUG_SetBreakpoints( BOOL set ); extern void DEBUG_SetBreakpoints( BOOL set );
extern void DEBUG_AddBreakpoint( const DBG_VALUE *addr ); extern void DEBUG_AddBreakpoint( const DBG_VALUE *addr, BOOL (*func)(void) );
extern void DEBUG_AddWatchpoint( const DBG_VALUE *addr, int is_write ); extern void DEBUG_AddWatchpoint( const DBG_VALUE *addr, int is_write );
extern void DEBUG_DelBreakpoint( int num ); extern void DEBUG_DelBreakpoint( int num );
extern void DEBUG_EnableBreakpoint( int num, BOOL enable ); extern void DEBUG_EnableBreakpoint( int num, BOOL enable );
......
debugger/intvar.h
View file @ b971745c
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
/* break handling */ /* break handling */
INTERNAL_VAR(BreakAllThreadsStartup, FALSE, NULL, DEBUG_TypeIntConst) INTERNAL_VAR(BreakAllThreadsStartup, FALSE, NULL, DEBUG_TypeIntConst)
INTERNAL_VAR(BreakOnCritSectTimeOut, FALSE, NULL, DEBUG_TypeIntConst) INTERNAL_VAR(BreakOnCritSectTimeOut, FALSE, NULL, DEBUG_TypeIntConst)
INTERNAL_VAR(BreakOnAttach, FALSE, NULL, DEBUG_TypeIntConst)
/* output handling */ /* output handling */
INTERNAL_VAR(ConChannelMask, DBG_CHN_MESG, NULL, DEBUG_TypeIntConst) INTERNAL_VAR(ConChannelMask, DBG_CHN_MESG, NULL, DEBUG_TypeIntConst)
......
debugger/module.c
View file @ b971745c
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include "file.h" #include "file.h"
#include "debugger.h" #include "debugger.h"
#include "toolhelp.h" #include "toolhelp.h"
#include "wingdi.h"
#include "winuser.h"
/*********************************************************************** /***********************************************************************
* Creates and links a new module to the current process * Creates and links a new module to the current process
...@@ -235,7 +237,7 @@ static void DEBUG_LoadModule16(HMODULE hModule, NE_MODULE* module, char* moduleA ...@@ -235,7 +237,7 @@ static void DEBUG_LoadModule16(HMODULE hModule, NE_MODULE* module, char* moduleA
void DEBUG_LoadModule32(const char* name, HANDLE hFile, DWORD base) void DEBUG_LoadModule32(const char* name, HANDLE hFile, DWORD base)
{ {
DBG_VALUE value; DBG_VALUE value;
char buffer[256]; char buffer[512];
char bufstr[256]; char bufstr[256];
int i; int i;
IMAGE_NT_HEADERS pe_header; IMAGE_NT_HEADERS pe_header;
...@@ -273,7 +275,7 @@ void DEBUG_LoadModule32(const char* name, HANDLE hFile, DWORD base) ...@@ -273,7 +275,7 @@ void DEBUG_LoadModule32(const char* name, HANDLE hFile, DWORD base)
DEBUG_AddSymbol(name, &value, NULL, SYM_WIN32 | SYM_FUNC); DEBUG_AddSymbol(name, &value, NULL, SYM_WIN32 | SYM_FUNC);
/* Add entry point */ /* Add entry point */
sprintf(buffer, "%s.EntryPoint", name); wsnprintf(buffer, sizeof(buffer), "%s.EntryPoint", name);
value.addr.off = base + pe_header.OptionalHeader.AddressOfEntryPoint; value.addr.off = base + pe_header.OptionalHeader.AddressOfEntryPoint;
DEBUG_AddSymbol(buffer, &value, NULL, SYM_WIN32 | SYM_FUNC); DEBUG_AddSymbol(buffer, &value, NULL, SYM_WIN32 | SYM_FUNC);
...@@ -284,7 +286,7 @@ void DEBUG_LoadModule32(const char* name, HANDLE hFile, DWORD base) ...@@ -284,7 +286,7 @@ void DEBUG_LoadModule32(const char* name, HANDLE hFile, DWORD base)
for (i = 0; i < pe_header.FileHeader.NumberOfSections; i++, pe_seg_ofs += sizeof(pe_seg)) { for (i = 0; i < pe_header.FileHeader.NumberOfSections; i++, pe_seg_ofs += sizeof(pe_seg)) {
if (!DEBUG_READ_MEM_VERBOSE((void*)(base + pe_seg_ofs), &pe_seg, sizeof(pe_seg))) if (!DEBUG_READ_MEM_VERBOSE((void*)(base + pe_seg_ofs), &pe_seg, sizeof(pe_seg)))
continue; continue;
sprintf(buffer, "%s.%s", name, pe_seg.Name); wsnprintf(buffer, sizeof(buffer), "%s.%s", name, pe_seg.Name);
value.addr.off = base + pe_seg.VirtualAddress; value.addr.off = base + pe_seg.VirtualAddress;
DEBUG_AddSymbol(buffer, &value, NULL, SYM_WIN32 | SYM_FUNC); DEBUG_AddSymbol(buffer, &value, NULL, SYM_WIN32 | SYM_FUNC);
} }
...@@ -320,7 +322,7 @@ void DEBUG_LoadModule32(const char* name, HANDLE hFile, DWORD base) ...@@ -320,7 +322,7 @@ void DEBUG_LoadModule32(const char* name, HANDLE hFile, DWORD base)
!DEBUG_READ_MEM_VERBOSE((void*)(base + names[i]), bufstr, sizeof(bufstr))) !DEBUG_READ_MEM_VERBOSE((void*)(base + names[i]), bufstr, sizeof(bufstr)))
continue; continue;
bufstr[sizeof(bufstr) - 1] = 0; bufstr[sizeof(bufstr) - 1] = 0;
sprintf(buffer, "%s.%s", name, bufstr); wsnprintf(buffer, sizeof(buffer), "%s.%s", name, bufstr);
value.addr.off = base + (DWORD)functions[ordinals[i]]; value.addr.off = base + (DWORD)functions[ordinals[i]];
DEBUG_AddSymbol(buffer, &value, NULL, SYM_WIN32 | SYM_FUNC); DEBUG_AddSymbol(buffer, &value, NULL, SYM_WIN32 | SYM_FUNC);
} }
...@@ -331,7 +333,7 @@ void DEBUG_LoadModule32(const char* name, HANDLE hFile, DWORD base) ...@@ -331,7 +333,7 @@ void DEBUG_LoadModule32(const char* name, HANDLE hFile, DWORD base)
for (j = 0; j < exports.NumberOfNames; j++) for (j = 0; j < exports.NumberOfNames; j++)
if ((ordinals[j] == i) && names[j]) break; if ((ordinals[j] == i) && names[j]) break;
if (j < exports.NumberOfNames) continue; if (j < exports.NumberOfNames) continue;
sprintf(buffer, "%s.%ld", name, i + exports.Base); wsnprintf(buffer, sizeof(buffer), "%s.%ld", name, i + exports.Base);
value.addr.off = base + (DWORD)functions[i]; value.addr.off = base + (DWORD)functions[i];
DEBUG_AddSymbol(buffer, &value, NULL, SYM_WIN32 | SYM_FUNC); DEBUG_AddSymbol(buffer, &value, NULL, SYM_WIN32 | SYM_FUNC);
} }
......
debugger/stabs.c
View file @ b971745c
...@@ -120,16 +120,17 @@ static unsigned int stab_hash( const char * name ) ...@@ -120,16 +120,17 @@ static unsigned int stab_hash( const char * name )
} }
static void stab_strcpy(char * dest, const char * source) static void stab_strcpy(char * dest, int sz, const char * source)
{ {
/* /*
* A strcpy routine that stops when we hit the ':' character. * A strcpy routine that stops when we hit the ':' character.
* Faster than copying the whole thing, and then nuking the * Faster than copying the whole thing, and then nuking the
* ':'. * ':'.
*/ */
while(*source != '\0' && *source != ':') while(*source != '\0' && *source != ':' && sz-- > 0)
*dest++ = *source++; *dest++ = *source++;
*dest++ = '\0'; *dest = '\0';
assert(sz > 0);
} }
typedef struct { typedef struct {
...@@ -402,7 +403,7 @@ DEBUG_HandlePreviousTypedef(const char * name, const char * stab) ...@@ -402,7 +403,7 @@ DEBUG_HandlePreviousTypedef(const char * name, const char * stab)
expect = DT_FUNC; expect = DT_FUNC;
break; break;
default: default:
DEBUG_Printf(DBG_CHN_MESG, "Unknown type (%c).\n",ptr[1]); DEBUG_Printf(DBG_CHN_FIXME, "Unknown type (%c).\n",ptr[1]);
return FALSE; return FALSE;
} }
if( expect != -1 && expect != DEBUG_GetType(ktd->types[count]) ) if( expect != -1 && expect != DEBUG_GetType(ktd->types[count]) )
...@@ -521,7 +522,7 @@ DEBUG_ParseTypedefStab(char * ptr, const char * typename) ...@@ -521,7 +522,7 @@ DEBUG_ParseTypedefStab(char * ptr, const char * typename)
curr_types[ntypes++] = *dt; curr_types[ntypes++] = *dt;
break; break;
case 'x': case 'x':
stab_strcpy(element_name, c + 3); stab_strcpy(element_name, sizeof(element_name), c + 3);
*dt = DEBUG_NewDataType(DT_STRUCT, element_name); *dt = DEBUG_NewDataType(DT_STRUCT, element_name);
curr_types[ntypes++] = *dt; curr_types[ntypes++] = *dt;
break; break;
...@@ -534,7 +535,8 @@ DEBUG_ParseTypedefStab(char * ptr, const char * typename) ...@@ -534,7 +535,8 @@ DEBUG_ParseTypedefStab(char * ptr, const char * typename)
curr_types[ntypes++] = *dt; curr_types[ntypes++] = *dt;
break; break;
default: default:
DEBUG_Printf(DBG_CHN_MESG, "Unknown type (%c).\n",c[1]); DEBUG_Printf(DBG_CHN_FIXME, "Unknown type (%c).\n",c[1]);
return FALSE;
} }
typename = NULL; typename = NULL;
...@@ -722,8 +724,8 @@ DEBUG_ParseTypedefStab(char * ptr, const char * typename) ...@@ -722,8 +724,8 @@ DEBUG_ParseTypedefStab(char * ptr, const char * typename)
strcpy(c, tc + 1); strcpy(c, tc + 1);
break; break;
default: default:
DEBUG_Printf(DBG_CHN_MESG, "Unknown type (%c).\n",c[1]); DEBUG_Printf(DBG_CHN_FIXME, "Unknown type (%c).\n",c[1]);
break; return FALSE;
} }
} }
/* /*
...@@ -838,8 +840,12 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset, ...@@ -838,8 +840,12 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset,
strcpy(stabbuff, ptr); strcpy(stabbuff, ptr);
ptr = stabbuff; ptr = stabbuff;
} }
stab_strcpy(symname, ptr); stab_strcpy(symname, sizeof(symname), ptr);
DEBUG_ParseTypedefStab(ptr, symname); if (!DEBUG_ParseTypedefStab(ptr, symname)) {
/* skip this definition */
stabbuff[0] = '\0';
continue;
}
} }
switch(stab_ptr->n_type) switch(stab_ptr->n_type)
...@@ -858,7 +864,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset, ...@@ -858,7 +864,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset,
new_value.addr.off = load_offset + stab_ptr->n_value; new_value.addr.off = load_offset + stab_ptr->n_value;
new_value.cookie = DV_TARGET; new_value.cookie = DV_TARGET;
stab_strcpy(symname, ptr); stab_strcpy(symname, sizeof(symname), ptr);
#ifdef __ELF__ #ifdef __ELF__
curr_sym = DEBUG_AddSymbol( symname, &new_value, currpath, curr_sym = DEBUG_AddSymbol( symname, &new_value, currpath,
SYM_WINE | SYM_DATA | SYM_INVALID ); SYM_WINE | SYM_DATA | SYM_INVALID );
...@@ -887,7 +893,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset, ...@@ -887,7 +893,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset,
new_value.addr.off = load_offset + stab_ptr->n_value; new_value.addr.off = load_offset + stab_ptr->n_value;
new_value.cookie = DV_TARGET; new_value.cookie = DV_TARGET;
stab_strcpy(symname, ptr); stab_strcpy(symname, sizeof(symname), ptr);
curr_sym = DEBUG_AddSymbol( symname, &new_value, currpath, curr_sym = DEBUG_AddSymbol( symname, &new_value, currpath,
SYM_WINE | SYM_DATA ); SYM_WINE | SYM_DATA );
break; break;
...@@ -897,7 +903,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset, ...@@ -897,7 +903,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset,
*/ */
if( curr_func != NULL && !in_external_file ) if( curr_func != NULL && !in_external_file )
{ {
stab_strcpy(symname, ptr); stab_strcpy(symname, sizeof(symname), ptr);
curr_loc = DEBUG_AddLocal( curr_func, 0, curr_loc = DEBUG_AddLocal( curr_func, 0,
stab_ptr->n_value, 0, 0, symname ); stab_ptr->n_value, 0, 0, symname );
DEBUG_SetLocalSymbolType( curr_loc, DEBUG_ParseStabType(ptr) ); DEBUG_SetLocalSymbolType( curr_loc, DEBUG_ParseStabType(ptr) );
...@@ -906,7 +912,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset, ...@@ -906,7 +912,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset,
case N_RSYM: case N_RSYM:
if( curr_func != NULL && !in_external_file ) if( curr_func != NULL && !in_external_file )
{ {
stab_strcpy(symname, ptr); stab_strcpy(symname, sizeof(symname), ptr);
curr_loc = DEBUG_AddLocal( curr_func, stab_ptr->n_value + 1, curr_loc = DEBUG_AddLocal( curr_func, stab_ptr->n_value + 1,
0, 0, 0, symname ); 0, 0, 0, symname );
DEBUG_SetLocalSymbolType( curr_loc, DEBUG_ParseStabType(ptr) ); DEBUG_SetLocalSymbolType( curr_loc, DEBUG_ParseStabType(ptr) );
...@@ -915,7 +921,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset, ...@@ -915,7 +921,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset,
case N_LSYM: case N_LSYM:
if( curr_func != NULL && !in_external_file ) if( curr_func != NULL && !in_external_file )
{ {
stab_strcpy(symname, ptr); stab_strcpy(symname, sizeof(symname), ptr);
curr_loc = DEBUG_AddLocal( curr_func, 0, curr_loc = DEBUG_AddLocal( curr_func, 0,
stab_ptr->n_value, 0, 0, symname ); stab_ptr->n_value, 0, 0, symname );
DEBUG_SetLocalSymbolType( curr_loc, DEBUG_ParseStabType(ptr) ); DEBUG_SetLocalSymbolType( curr_loc, DEBUG_ParseStabType(ptr) );
...@@ -957,7 +963,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset, ...@@ -957,7 +963,7 @@ DEBUG_ParseStabs(char * addr, unsigned int load_offset,
*/ */
if( !in_external_file) if( !in_external_file)
{ {
stab_strcpy(symname, ptr); stab_strcpy(symname, sizeof(symname), ptr);
if (*symname) if (*symname)
{ {
new_value.addr.seg = 0; new_value.addr.seg = 0;
...@@ -1302,15 +1308,61 @@ leave: ...@@ -1302,15 +1308,61 @@ leave:
return rtn; return rtn;
} }
int static BOOL DEBUG_WalkList(struct r_debug* dbg_hdr)
DEBUG_ReadExecutableDbgInfo(const char* exe_name)
{ {
Elf32_Dyn dyn;
struct r_debug dbg_hdr;
u_long lm_addr; u_long lm_addr;
struct link_map lm; struct link_map lm;
Elf32_Ehdr ehdr; Elf32_Ehdr ehdr;
char bufstr[256]; char bufstr[256];
/*
* Now walk the linked list. In all known ELF implementations,
* the dynamic loader maintains this linked list for us. In some
* cases the first entry doesn't appear with a name, in other cases it
* does.
*/
for (lm_addr = (u_long)dbg_hdr->r_map; lm_addr; lm_addr = (u_long)lm.l_next) {
if (!DEBUG_READ_MEM_VERBOSE((void*)lm_addr, &lm, sizeof(lm)))
return FALSE;
if (lm.l_addr != 0 &&
DEBUG_READ_MEM_VERBOSE((void*)lm.l_addr, &ehdr, sizeof(ehdr)) &&
ehdr.e_type == ET_DYN && /* only look at dynamic modules */
lm.l_name != NULL &&
DEBUG_READ_MEM_VERBOSE(lm.l_name, bufstr, sizeof(bufstr))) {
bufstr[sizeof(bufstr) - 1] = '\0';
DEBUG_ProcessElfObject(bufstr, lm.l_addr);
}
}
return TRUE;
}
static BOOL DEBUG_RescanElf(void)
{
struct r_debug dbg_hdr;
if (!DEBUG_CurrProcess ||
!DEBUG_READ_MEM_VERBOSE((void*)DEBUG_CurrProcess->dbg_hdr_addr, &dbg_hdr, sizeof(dbg_hdr)))
return FALSE;
switch (dbg_hdr.r_state) {
case RT_CONSISTENT:
DEBUG_WalkList(&dbg_hdr);
break;
case RT_ADD:
break;
case RT_DELETE:
/*FIXME: this is not currently handled, would need some kind of mark&sweep algo */
break;
}
return FALSE;
}
int
DEBUG_ReadExecutableDbgInfo(const char* exe_name)
{
Elf32_Dyn dyn;
struct r_debug dbg_hdr;
int rtn = FALSE; int rtn = FALSE;
DBG_VALUE val; DBG_VALUE val;
...@@ -1341,27 +1393,25 @@ DEBUG_ReadExecutableDbgInfo(const char* exe_name) ...@@ -1341,27 +1393,25 @@ DEBUG_ReadExecutableDbgInfo(const char* exe_name)
if (!DEBUG_READ_MEM_VERBOSE((void*)dyn.d_un.d_ptr, &dbg_hdr, sizeof(dbg_hdr))) if (!DEBUG_READ_MEM_VERBOSE((void*)dyn.d_un.d_ptr, &dbg_hdr, sizeof(dbg_hdr)))
goto leave; goto leave;
/* assert(!DEBUG_CurrProcess->dbg_hdr_addr);
* Now walk the linked list. In all known ELF implementations, DEBUG_CurrProcess->dbg_hdr_addr = (u_long)dyn.d_un.d_ptr;
* the dynamic loader maintains this linked list for us. In some
* cases the first entry doesn't appear with a name, in other cases it if (dbg_hdr.r_brk) {
* does. DBG_VALUE value;
*/
for (lm_addr = (u_long)dbg_hdr.r_map; lm_addr; lm_addr = (u_long)lm.l_next) DEBUG_Printf(DBG_CHN_TRACE, "Setting up a breakpoint on r_brk(%lx)\n",
{ dbg_hdr.r_brk);
if (!DEBUG_READ_MEM_VERBOSE((void*)lm_addr, &lm, sizeof(lm)))
goto leave; DEBUG_SetBreakpoints(FALSE);
if (lm.l_addr != 0 && value.type = NULL;
DEBUG_READ_MEM_VERBOSE((void*)lm.l_addr, &ehdr, sizeof(ehdr)) && value.cookie = DV_TARGET;
ehdr.e_type == ET_DYN && /* only look at dynamic modules */ value.addr.seg = 0;
lm.l_name != NULL && value.addr.off = dbg_hdr.r_brk;
DEBUG_READ_MEM_VERBOSE(lm.l_name, bufstr, sizeof(bufstr))) { DEBUG_AddBreakpoint(&value, DEBUG_RescanElf);
bufstr[sizeof(bufstr) - 1] = '\0'; DEBUG_SetBreakpoints(TRUE);
DEBUG_ProcessElfObject(bufstr, lm.l_addr); }
}
} rtn = DEBUG_WalkList(&dbg_hdr);
rtn = TRUE;
leave: leave:
return rtn; return rtn;
......
debugger/winedbg.c
View file @ b971745c
...@@ -44,8 +44,14 @@ int DEBUG_Printf(int chn, const char* format, ...) ...@@ -44,8 +44,14 @@ int DEBUG_Printf(int chn, const char* format, ...)
int len; int len;
va_start(valist, format); va_start(valist, format);
len = vsprintf(buf, format, valist); len = wvsnprintf(buf, sizeof(buf), format, valist);
va_end(valist); va_end(valist);
if (len <= -1) {
len = sizeof(buf) - 1;
buf[len] = 0;
buf[len - 1] = buf[len - 2] = buf[len - 3] = '.';
}
DEBUG_Output(chn, buf, len); DEBUG_Output(chn, buf, len);
return len; return len;
} }
...@@ -110,8 +116,8 @@ DBG_INTVAR* DEBUG_GetIntVar(const char* name) ...@@ -110,8 +116,8 @@ DBG_INTVAR* DEBUG_GetIntVar(const char* name)
static WINE_EXCEPTION_FILTER(wine_dbg) static WINE_EXCEPTION_FILTER(wine_dbg)
{ {
DEBUG_Printf(DBG_CHN_MESG, "\nwine_dbg: Exception (%lx) inside debugger, continuing...\n", GetExceptionCode());
DEBUG_ExternalDebugger(); DEBUG_ExternalDebugger();
DEBUG_Printf(DBG_CHN_MESG, "\nwine_dbg: Exception %lx\n", GetExceptionCode());
return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_EXECUTE_HANDLER;
} }
...@@ -133,8 +139,10 @@ static DBG_PROCESS* DEBUG_AddProcess(DWORD pid, HANDLE h) ...@@ -133,8 +139,10 @@ static DBG_PROCESS* DEBUG_AddProcess(DWORD pid, HANDLE h)
p->pid = pid; p->pid = pid;
p->threads = NULL; p->threads = NULL;
p->num_threads = 0; p->num_threads = 0;
p->continue_on_first_exception = FALSE;
p->modules = NULL; p->modules = NULL;
p->next_index = 0; p->next_index = 0;
p->dbg_hdr_addr = 0;
p->next = proc; p->next = proc;
p->prev = NULL; p->prev = NULL;
...@@ -229,7 +237,7 @@ static void DEBUG_InitCurrThread(void) ...@@ -229,7 +237,7 @@ static void DEBUG_InitCurrThread(void)
value.cookie = DV_TARGET; value.cookie = DV_TARGET;
value.addr.seg = 0; value.addr.seg = 0;
value.addr.off = (DWORD)DEBUG_CurrThread->start; value.addr.off = (DWORD)DEBUG_CurrThread->start;
DEBUG_AddBreakpoint(&value); DEBUG_AddBreakpoint(&value, NULL);
DEBUG_SetBreakpoints(TRUE); DEBUG_SetBreakpoints(TRUE);
} }
} else { } else {
...@@ -268,7 +276,7 @@ static BOOL DEBUG_HandleException( EXCEPTION_RECORD *rec, BOOL first_chance, BOO ...@@ -268,7 +276,7 @@ static BOOL DEBUG_HandleException( EXCEPTION_RECORD *rec, BOOL first_chance, BOO
/* print some infos */ /* print some infos */
DEBUG_Printf( DBG_CHN_MESG, "%s: ", DEBUG_Printf( DBG_CHN_MESG, "%s: ",
first_chance ? "First chance exception" : "Unhandled exception" ); first_chance ? "First chance exception" : "Unhandled exception" );
switch(rec->ExceptionCode) switch (rec->ExceptionCode)
{ {
case EXCEPTION_INT_DIVIDE_BY_ZERO: case EXCEPTION_INT_DIVIDE_BY_ZERO:
DEBUG_Printf( DBG_CHN_MESG, "divide by zero" ); DEBUG_Printf( DBG_CHN_MESG, "divide by zero" );
...@@ -312,10 +320,9 @@ static BOOL DEBUG_HandleException( EXCEPTION_RECORD *rec, BOOL first_chance, BOO ...@@ -312,10 +320,9 @@ static BOOL DEBUG_HandleException( EXCEPTION_RECORD *rec, BOOL first_chance, BOO
DEBUG_Printf( DBG_CHN_MESG, "%08lx", rec->ExceptionCode ); DEBUG_Printf( DBG_CHN_MESG, "%08lx", rec->ExceptionCode );
break; break;
} }
DEBUG_Printf(DBG_CHN_MESG, "\n");
} }
DEBUG_Printf(DBG_CHN_MESG, "\n");
DEBUG_Printf(DBG_CHN_TRACE, DEBUG_Printf(DBG_CHN_TRACE,
"Entering debugger PC=%lx EFL=%08lx mode=%d count=%d\n", "Entering debugger PC=%lx EFL=%08lx mode=%d count=%d\n",
DEBUG_context.Eip, DEBUG_context.EFlags, DEBUG_context.Eip, DEBUG_context.EFlags,
...@@ -353,20 +360,24 @@ static BOOL DEBUG_HandleDebugEvent(DEBUG_EVENT* de, LPDWORD cont) ...@@ -353,20 +360,24 @@ static BOOL DEBUG_HandleDebugEvent(DEBUG_EVENT* de, LPDWORD cont)
break; break;
} }
DEBUG_Printf(DBG_CHN_TRACE, "%08lx:%08lx: exception code=%08lx %d\n", DEBUG_Printf(DBG_CHN_TRACE, "%08lx:%08lx: exception code=%08lx\n",
de->dwProcessId, de->dwThreadId, de->dwProcessId, de->dwThreadId,
de->u.Exception.ExceptionRecord.ExceptionCode, de->u.Exception.ExceptionRecord.ExceptionCode);
DEBUG_CurrThread->wait_for_first_exception);
if (DEBUG_CurrProcess->continue_on_first_exception) {
DEBUG_CurrProcess->continue_on_first_exception = FALSE;
if (!DBG_IVAR(BreakOnAttach)) {
*cont = DBG_CONTINUE;
break;
}
}
DEBUG_context.ContextFlags = CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_SEGMENTS|CONTEXT_DEBUG_REGISTERS; DEBUG_context.ContextFlags = CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_SEGMENTS|CONTEXT_DEBUG_REGISTERS;
if (!GetThreadContext(DEBUG_CurrThread->handle, &DEBUG_context)) { if (!GetThreadContext(DEBUG_CurrThread->handle, &DEBUG_context)) {
DEBUG_Printf(DBG_CHN_WARN, "Can't get thread's context\n"); DEBUG_Printf(DBG_CHN_WARN, "Can't get thread's context\n");
break; break;
} }
DEBUG_Printf(DBG_CHN_TRACE, "%p:%p\n", de->u.Exception.ExceptionRecord.ExceptionAddress,
(void*)DEBUG_context.Eip);
*cont = DEBUG_HandleException(&de->u.Exception.ExceptionRecord, *cont = DEBUG_HandleException(&de->u.Exception.ExceptionRecord,
de->u.Exception.dwFirstChance, de->u.Exception.dwFirstChance,
DEBUG_CurrThread->wait_for_first_exception); DEBUG_CurrThread->wait_for_first_exception);
...@@ -416,15 +427,19 @@ static BOOL DEBUG_HandleDebugEvent(DEBUG_EVENT* de, LPDWORD cont) ...@@ -416,15 +427,19 @@ static BOOL DEBUG_HandleDebugEvent(DEBUG_EVENT* de, LPDWORD cont)
de->u.CreateProcessInfo.dwDebugInfoFileOffset, de->u.CreateProcessInfo.dwDebugInfoFileOffset,
de->u.CreateProcessInfo.nDebugInfoSize); de->u.CreateProcessInfo.nDebugInfoSize);
if (DEBUG_GetProcess(de->dwProcessId) != NULL) { if ((DEBUG_CurrProcess = DEBUG_GetProcess(de->dwProcessId)) != NULL) {
DEBUG_Printf(DBG_CHN_TRACE, "Skipping already defined process\n"); if (DEBUG_CurrProcess->handle) {
break; DEBUG_Printf(DBG_CHN_ERR, "Skipping already defined process\n");
} break;
DEBUG_CurrProcess = DEBUG_AddProcess(de->dwProcessId, }
de->u.CreateProcessInfo.hProcess); DEBUG_CurrProcess->handle = de->u.CreateProcessInfo.hProcess;
if (DEBUG_CurrProcess == NULL) { } else {
DEBUG_Printf(DBG_CHN_ERR, "Unknown process\n"); DEBUG_CurrProcess = DEBUG_AddProcess(de->dwProcessId,
break; de->u.CreateProcessInfo.hProcess);
if (DEBUG_CurrProcess == NULL) {
DEBUG_Printf(DBG_CHN_ERR, "Unknown process\n");
break;
}
} }
DEBUG_Printf(DBG_CHN_TRACE, "%08lx:%08lx: create thread I @%p\n", DEBUG_Printf(DBG_CHN_TRACE, "%08lx:%08lx: create thread I @%p\n",
...@@ -566,7 +581,7 @@ int DEBUG_main(int argc, char** argv) ...@@ -566,7 +581,7 @@ int DEBUG_main(int argc, char** argv)
DEBUG_InitTypes(); DEBUG_InitTypes();
DEBUG_InitCVDataTypes(); DEBUG_InitCVDataTypes();
/* Initialize internal vars */ /* Initialize internal vars (types must be initialized before) */
if (!DEBUG_IntVarsRW(TRUE)) return -1; if (!DEBUG_IntVarsRW(TRUE)) return -1;
/* keep it as a guiexe for now, so that Wine won't touch the Unix stdin, /* keep it as a guiexe for now, so that Wine won't touch the Unix stdin,
...@@ -585,6 +600,9 @@ int DEBUG_main(int argc, char** argv) ...@@ -585,6 +600,9 @@ int DEBUG_main(int argc, char** argv)
HANDLE hEvent; HANDLE hEvent;
if ((pid = atoi(argv[1])) != 0 && (hEvent = atoi(argv[2])) != 0) { if ((pid = atoi(argv[1])) != 0 && (hEvent = atoi(argv[2])) != 0) {
if (!(DEBUG_CurrProcess = DEBUG_AddProcess(pid, 0))) goto leave;
DEBUG_CurrProcess->continue_on_first_exception = TRUE;
if (!DebugActiveProcess(pid)) { if (!DebugActiveProcess(pid)) {
DEBUG_Printf(DBG_CHN_ERR, "Can't attach process %ld: %ld\n", DEBUG_Printf(DBG_CHN_ERR, "Can't attach process %ld: %ld\n",
pid, GetLastError()); pid, GetLastError());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment