fixed dereferencing of invalid pointers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index f42c88530e070a08b9cc46f1e58e263eb8759efc..67f907abca5cf755efba9db91d30fa17ca1a5c47 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -2302,7 +2302,7 @@ void wxDCBase::DrawLabel(const wxString& text,
     wxString curLine;
     for ( wxString::const_iterator pc = text.begin(); ; ++pc )
     {
     wxString curLine;
     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
 

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 229bdac946ebd25639a0604a6ab4dc375dedf3b8..1769f56c264b6639e0fe9d150e910d30db1dcb51 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -379,7 +379,7 @@ void wxHtmlWinParser::AddText(const wxString& txt)
             ++i, ++x;
             while ( (i < end) &&
                     (*i == wxT('\n') || *i == wxT('\r') ||
             ++i, ++x;
             while ( (i < end) &&
                     (*i == wxT('\n') || *i == wxT('\r') ||

-                     *i == wxT(' ')) || *i == wxT('\t') )
+                     *i == wxT(' ') || *i == wxT('\t')) )

             {
                 ++i;
                 ++x;
             {
                 ++i;
                 ++x;