ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Wrap error-prone msc symbol loading with a __TRY block.

This commit is contained in:
Gregory M. Turner 2003-08-19 00:57:58 +00:00 committed by Alexandre Julliard
parent 9650db497b
commit 7bcf7b1602
1 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
programs/winedbg/msc.c
View File

@ -37,6 +37,8 @@
#ifndef PATH_MAX #ifndef PATH_MAX
#define PATH_MAX MAX_PATH #define PATH_MAX MAX_PATH
#endif #endif
#include "wine/exception.h"
#include "excpt.h"
#include "debugger.h" #include "debugger.h"
#define MAX_PATHNAME_LEN 1024 #define MAX_PATHNAME_LEN 1024
@ -62,6 +64,12 @@ typedef struct tagMSC_DBG_INFO
* Debug file access helper routines * Debug file access helper routines
*/ */
static WINE_EXCEPTION_FILTER(page_fault)
{
if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION)
return EXCEPTION_EXECUTE_HANDLER;
return EXCEPTION_CONTINUE_SEARCH;
}
/*********************************************************************** /***********************************************************************
* DEBUG_LocateDebugInfoFile * DEBUG_LocateDebugInfoFile
@ -2860,43 +2868,44 @@ static enum DbgInfoLoad DEBUG_ProcessDebugDirectory( DBG_MODULE *module,
PIMAGE_DEBUG_DIRECTORY dbg, PIMAGE_DEBUG_DIRECTORY dbg,
int nDbg ) int nDbg )
{ {
enum DbgInfoLoad dil = DIL_ERROR; enum DbgInfoLoad dil;
int i; int i;
__TRY {
/* First, watch out for OMAP data */ dil = DIL_ERROR;
for ( i = 0; i < nDbg; i++ ) /* First, watch out for OMAP data */
{ for ( i = 0; i < nDbg; i++ )
if ( dbg[i].Type == IMAGE_DEBUG_TYPE_OMAP_FROM_SRC )
{ {
module->msc_info->nomap = dbg[i].SizeOfData / sizeof(OMAP_DATA); if ( dbg[i].Type == IMAGE_DEBUG_TYPE_OMAP_FROM_SRC )
module->msc_info->omapp = (OMAP_DATA *)(file_map + dbg[i].PointerToRawData); {
break; module->msc_info->nomap = dbg[i].SizeOfData / sizeof(OMAP_DATA);
module->msc_info->omapp = (OMAP_DATA *)(file_map + dbg[i].PointerToRawData);
break;
}
} }
}
/* Now, try to parse CodeView debug info */
/* Now, try to parse CodeView debug info */ for ( i = 0; dil != DIL_LOADED && i < nDbg; i++ )
for ( i = 0; dil != DIL_LOADED && i < nDbg; i++ )
{
if ( dbg[i].Type == IMAGE_DEBUG_TYPE_CODEVIEW )
{ {
dil = DEBUG_ProcessCodeView( module, file_map + dbg[i].PointerToRawData ); if ( dbg[i].Type == IMAGE_DEBUG_TYPE_CODEVIEW )
{
dil = DEBUG_ProcessCodeView( module, file_map + dbg[i].PointerToRawData );
}
}
/* If not found, try to parse COFF debug info */
for ( i = 0; dil != DIL_LOADED && i < nDbg; i++ )
{
if ( dbg[i].Type == IMAGE_DEBUG_TYPE_COFF )
dil = DEBUG_ProcessCoff( module, file_map + dbg[i].PointerToRawData );
} }
}
/* If not found, try to parse COFF debug info */
for ( i = 0; dil != DIL_LOADED && i < nDbg; i++ )
{
if ( dbg[i].Type == IMAGE_DEBUG_TYPE_COFF )
dil = DEBUG_ProcessCoff( module, file_map + dbg[i].PointerToRawData );
}
#if 0 #if 0
/* FIXME: this should be supported... this is the debug information for /* FIXME: this should be supported... this is the debug information for
* functions compiled without a frame pointer (FPO = frame pointer omission) * functions compiled without a frame pointer (FPO = frame pointer omission)
* the associated data helps finding out the relevant information * the associated data helps finding out the relevant information
*/ */
for ( i = 0; i < nDbg; i++ ) for ( i = 0; i < nDbg; i++ )
if ( dbg[i].Type == IMAGE_DEBUG_TYPE_FPO ) if ( dbg[i].Type == IMAGE_DEBUG_TYPE_FPO )
DEBUG_Printf(DBG_CHN_MESG, "This guy has FPO information\n"); DEBUG_Printf(DBG_CHN_MESG, "This guy has FPO information\n");
#define FRAME_FPO 0 #define FRAME_FPO 0
#define FRAME_TRAP 1 #define FRAME_TRAP 1
@ -2916,7 +2925,12 @@ typedef struct _FPO_DATA {
WORD cbFrame : 2; /* frame type */ WORD cbFrame : 2; /* frame type */
} FPO_DATA; } FPO_DATA;
#endif #endif
}
__EXCEPT(page_fault)
{
return DIL_ERROR;
}
__ENDTRY
return dil; return dil;
} }