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

fixed dereferencing of invalid pointers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-07-07 12:30:27 +00:00
parent e966f815d4
commit f5595af61e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/dcbase.cpp
View File

@@ -2302,7 +2302,7 @@ void wxDCBase::DrawLabel(const wxString& text,
wxString curLine; wxString curLine;
for ( wxString::const_iterator pc = text.begin(); ; ++pc ) for ( wxString::const_iterator pc = text.begin(); ; ++pc )
{ {
if ( *pc == _T('\n') || pc == text.end() ) if ( pc == text.end() || *pc == _T('\n') )
{ {
int xRealStart = x; // init it here to avoid compielr warnings int xRealStart = x; // init it here to avoid compielr warnings

2
src/html/winpars.cpp
View File

@@ -379,7 +379,7 @@ void wxHtmlWinParser::AddText(const wxString& txt)
++i, ++x; ++i, ++x;
while ( (i < end) && while ( (i < end) &&
(*i == wxT('\n') || *i == wxT('\r') || (*i == wxT('\n') || *i == wxT('\r') ||
*i == wxT(' ')) || *i == wxT('\t') ) *i == wxT(' ') || *i == wxT('\t')) )
{ {
++i; ++i;
++x; ++x;