X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/948c6134e7cd57a0b776b9440975a73ce30d7d03..062dfc9a96dc9e796c53544f41ff92dc47f26e82:/src/html/htmlpars.cpp?ds=sidebyside

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 38c0680c23..ed99a443b6 100644
--- 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;
-                textBeginning = i+1;
+                textBeginning = i < end_pos ? i+1 : i;
             }
         }
         else ++i;
@@ -958,7 +958,7 @@ wxHtmlParser::SkipCommentTag(wxString::const_iterator& start,
     wxString::const_iterator p = start;
 
     // comments begin with "<!--" in HTML 4.0
-    if ( p > end - 3 || *++p != '!' || *++p != '-' || *++p != '-' )
+    if ( end - start < 4 || *++p != '!' || *++p != '-' || *++p != '-' )
     {
         // not a comment at all
         return false;