]> git.saurik.com Git - wxWidgets.git/commitdiff
fixed incorrect handling of end iterator in HtmlizeLinebreaks() introduced in r53298...
authorVáclav Slavík <vslavik@fastmail.fm>
Sun, 4 May 2008 08:45:43 +0000 (08:45 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Sun, 4 May 2008 08:45:43 +0000 (08:45 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/html/m_pre.cpp

index c69db2129d5c362a15ef0ef07b44edf03945a860..c4a33f8c82892f84fcde411bc1d5995ca31a537d 100644 (file)
@@ -33,16 +33,19 @@ static wxString LINKAGEMODE HtmlizeLinebreaks(const wxString& str)
     wxString out;
     out.reserve(str.length()); // we'll certainly need at least that
 
-    for ( wxString::const_iterator i = str.begin(); i != str.end(); ++i )
+    const wxString::const_iterator end = str.end();
+    for ( wxString::const_iterator i = str.begin(); i != end; ++i )
     {
         switch ( (*i).GetValue() )
         {
             case '<':
-                while ( i != str.end() && *i != '>')
+                while ( i != end && *i != '>' )
                 {
                     out << *i++;
                 }
                 out << '>';
+                if ( i == end )
+                    return out;
                 break;
             case '\n':
                 out << "<br>";
@@ -52,6 +55,7 @@ static wxString LINKAGEMODE HtmlizeLinebreaks(const wxString& str)
                 break;
         }
     }
+
     return out;
 }