Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't crash when trying to dump struct members which are NULL pointers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-27 14:26:10 +00:00
parent a67f1484e0
commit 120678ee96
1 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/msw/debughlp.cpp
View File

@@ -305,46 +305,53 @@ wxDbgHelpDLL::DumpField(PSYMBOL_INFO pSym, void *pVariable, unsigned level)
break; break;
case SYMBOL_TAG_DATA: case SYMBOL_TAG_DATA:
wxDbgHelpDLL::DataKind kind; if ( !pVariable )
if ( !DoGetTypeInfo(pSym, TI_GET_DATAKIND, &kind) ||
kind != DATA_MEMBER )
{ {
// maybe it's a static member? we're not interested in them... s = _T("NULL");
break;
} }
else // valid location
// get the offset of the child member, relative to its parent
DWORD ofs = 0;
if ( !DoGetTypeInfo(pSym, TI_GET_OFFSET, &ofs) )
break;
pVariable = (void *)((DWORD_PTR)pVariable + ofs);
// now pass to the type representing the type of this member
SYMBOL_INFO sym = *pSym;
if ( !DoGetTypeInfo(pSym, TI_GET_TYPEID, &sym.TypeIndex) )
break;
ULONG64 size;
DoGetTypeInfo(&sym, TI_GET_LENGTH, &size);
switch ( DereferenceSymbol(&sym, &pVariable) )
{ {
case SYMBOL_TAG_BASE_TYPE: wxDbgHelpDLL::DataKind kind;
{ if ( !DoGetTypeInfo(pSym, TI_GET_DATAKIND, &kind) ||
BasicType bt = GetBasicType(&sym); kind != DATA_MEMBER )
if ( bt ) {
{ // maybe it's a static member? we're not interested in them...
s = DumpBaseType(bt, size, pVariable); break;
} }
}
// get the offset of the child member, relative to its parent
DWORD ofs = 0;
if ( !DoGetTypeInfo(pSym, TI_GET_OFFSET, &ofs) )
break; break;
case SYMBOL_TAG_UDT: pVariable = (void *)((DWORD_PTR)pVariable + ofs);
case SYMBOL_TAG_BASE_CLASS:
s = DumpUDT(&sym, pVariable, level);
// now pass to the type representing the type of this member
SYMBOL_INFO sym = *pSym;
if ( !DoGetTypeInfo(pSym, TI_GET_TYPEID, &sym.TypeIndex) )
break; break;
ULONG64 size;
DoGetTypeInfo(&sym, TI_GET_LENGTH, &size);
switch ( DereferenceSymbol(&sym, &pVariable) )
{
case SYMBOL_TAG_BASE_TYPE:
{
BasicType bt = GetBasicType(&sym);
if ( bt )
{
s = DumpBaseType(bt, size, pVariable);
}
}
break;
case SYMBOL_TAG_UDT:
case SYMBOL_TAG_BASE_CLASS:
s = DumpUDT(&sym, pVariable, level);
break;
}
} }
if ( !s.empty() ) if ( !s.empty() )
@@ -458,7 +465,16 @@ wxDbgHelpDLL::DereferenceSymbol(PSYMBOL_INFO pSym, void **ppData)
// remove one level of indirection except for the char strings: we want // remove one level of indirection except for the char strings: we want
// to dump "char *" and not a single "char" for them // to dump "char *" and not a single "char" for them
if ( ppData && *ppData && GetBasicType(pSym) != BASICTYPE_CHAR ) if ( ppData && *ppData && GetBasicType(pSym) != BASICTYPE_CHAR )
*ppData = (void *)*((DWORD_PTR *)*ppData); {
DWORD_PTR *pData = (DWORD_PTR *)*ppData;
if ( ::IsBadReadPtr(pData, sizeof(DWORD_PTR *)) )
{
break;
}
*ppData = (void *)*pData;
}
} }
return tag; return tag;