missing commit

[wxWidgets.git] / src / html / htmlpars.cpp

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 38c0680c232a5eb5507c41f2d7118c9862500dba..dad3f09a427a6e554b0da5dd4b74d618c27d99ae 100644 (file)
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -227,7 +227,7 @@ void wxHtmlParser::CreateDOMSubTree(wxHtmlTag *cur,
             else
             {
                 while (i < end_pos && *i != wxT('>')) ++i;
             else
             {
                 while (i < end_pos && *i != wxT('>')) ++i;

-                textBeginning = i+1;
+                textBeginning = i < end_pos ? i+1 : i;

             }
         }
         else ++i;
             }
         }
         else ++i;


@@ -957,12 +957,14 @@ wxHtmlParser::SkipCommentTag(wxString::const_iterator& start,
 
     wxString::const_iterator p = start;
 
 
     wxString::const_iterator p = start;
 

-    // comments begin with "<!--" in HTML 4.0
-    if ( p > end - 3 || *++p != '!' || *++p != '-' || *++p != '-' )
-    {
-        // not a comment at all
-        return false;
-    }
+    // Comments begin with "<!--" in HTML 4.0; anything shorter or not containing
+    // these characters is not a comment and we're not going to skip it.
+    if ( ++p == end || *p != '!' )
+      return false;
+    if ( ++p == end || *p != '-' )
+      return false;
+    if ( ++p == end || *p != '-' )
+      return false;

 
     // skip the start of the comment tag in any case, if we don't find the
     // closing tag we should ignore broken markup
 
     // skip the start of the comment tag in any case, if we don't find the
     // closing tag we should ignore broken markup