adapting to init pattern

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

diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index 3c312275a707e0a3007edb76210d6c3853cfec9d..ed99a443b69d5f3b89858becad6c98ec097890f5 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;


@@ -250,8 +250,7 @@ void wxHtmlParser::DestroyDOMTree()
     }
     m_Tags = m_CurTag = NULL;
 
     }
     m_Tags = m_CurTag = NULL;
 

-    delete m_TextPieces;
-    m_TextPieces = NULL;
+    wxDELETE(m_TextPieces);

 }
 
 void wxHtmlParser::DoParsing()
 }
 
 void wxHtmlParser::DoParsing()


@@ -870,10 +869,14 @@ wxChar wxHtmlEntitiesParser::GetEntityChar(const wxString& entity) const
         return GetCharForCode(code);
 }
 
         return GetCharForCode(code);
 }
 

-wxFSFile *wxHtmlParser::OpenURL(wxHtmlURLType WXUNUSED(type),
+wxFSFile *wxHtmlParser::OpenURL(wxHtmlURLType type,

                                 const wxString& url) const
 {
                                 const wxString& url) const
 {

-    return m_FS ? m_FS->OpenFile(url) : NULL;
+    int flags = wxFS_READ;
+    if (type == wxHTML_URL_IMAGE)
+        flags |= wxFS_SEEKABLE;
+
+    return m_FS ? m_FS->OpenFile(url, flags) : NULL;

 
 }
 
 
 }
 


@@ -955,7 +958,7 @@ wxHtmlParser::SkipCommentTag(wxString::const_iterator& start,
     wxString::const_iterator p = start;
 
     // comments begin with "<!--" in HTML 4.0
     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;
     {
         // not a comment at all
         return false;