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

check the validity of wxString pointer itself too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-07-20 18:32:57 +00:00
parent e1f2de5ab3
commit b0c4316ebd
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/debughlp.cpp
View File

@@ -404,15 +404,19 @@ wxDbgHelpDLL::DumpUDT(PSYMBOL_INFO pSym, void *pVariable, unsigned level)
// between GetWriteBuf() and UngetWriteBuf() calls) and assert when we // between GetWriteBuf() and UngetWriteBuf() calls) and assert when we
// try to access it contents using public methods, so instead use our // try to access it contents using public methods, so instead use our
// knowledge of its internals // knowledge of its internals
const wxChar *p = ps->data(); const wxChar *p = NULL;
wxStringData *data = (wxStringData *)p - 1; if ( !::IsBadReadPtr(ps, sizeof(wxString)) )
if ( ::IsBadReadPtr(data, sizeof(wxStringData)) ||
::IsBadReadPtr(p, sizeof(wxChar *)*data->nAllocLength) )
{ {
p = _T("???"); p = ps->data();
wxStringData *data = (wxStringData *)p - 1;
if ( ::IsBadReadPtr(data, sizeof(wxStringData)) ||
::IsBadReadPtr(p, sizeof(wxChar *)*data->nAllocLength) )
{
p = NULL; // don't touch this pointer with 10 feet pole
}
} }
s << _T("(\"") << p << _T(")\""); s << _T("(\"") << (p ? p : _T("???")) << _T(")\"");
} }
else // any other UDT else // any other UDT
#endif // !wxUSE_STL #endif // !wxUSE_STL