X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1729813a8d1b0769eee47fcda2b3b03b4f36e893..99f0dc688742156982e526639d17df4cb9003588:/src/html/htmltag.cpp diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index c52656cc8c..f5e93ffa03 100644 --- a/src/html/htmltag.cpp +++ b/src/html/htmltag.cpp @@ -114,9 +114,14 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) else { m_Cache[tg].End1 = m_Cache[tg].End2 = -1; - + if (wxIsCDATAElement(tagBuffer)) { + // store the orig pos in case we are missing the closing + // tag (see below) + wxInt32 old_pos = pos; + bool foundCloseTag = false; + // find next matching tag int tag_len = wxStrlen(tagBuffer); while (pos < lng) @@ -147,14 +152,25 @@ wxHtmlTagsCache::wxHtmlTagsCache(const wxString& source) } // found a match - if (match_pos == tag_len) { + if (match_pos == tag_len) + { pos = pos - tag_len - 3; + foundCloseTag = true; break; } - else { + else // keep looking for the closing tag + { ++pos; } } + if (!foundCloseTag) + { + // we didn't find closing tag; this means the markup + // is incorrect and the best thing we can do is to + // ignore the unclosed tag and continue parsing as if + // it didn't exist: + pos = old_pos; + } } } } @@ -442,7 +458,7 @@ bool wxHtmlTag::GetParamAsInt(const wxString& par, int *clr) const wxString wxHtmlTag::GetAllParams() const { - // VS: this function is for backward compatiblity only, + // VS: this function is for backward compatibility only, // never used by wxHTML wxString s; size_t cnt = m_ParamNames.GetCount();