Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oops, fixed fatal bug in new HTML parsing code (I wonder why it didn't crash when I played with it yesterday...)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-07-02 13:01:30 +00:00
parent b1f5d087c7
commit 367c84b903
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/html/htmlpars.cpp
View File

@@ -110,7 +110,7 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos)
else if (c == '<') else if (c == '<')
{ {
wxHtmlTag tag(m_Source, i, end_pos, m_Cache); wxHtmlTag tag(m_Source, i, end_pos, m_Cache, m_entitiesParser);
if (templen) if (templen)
{ {

10
src/html/htmltag.cpp
View File

@@ -206,7 +206,10 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos,
else if (state == ST_VALUE && quote == 0) else if (state == ST_VALUE && quote == 0)
{ {
m_ParamNames.Add(pname); m_ParamNames.Add(pname);
m_ParamValues.Add(entParser->Parse(pvalue)); if (entParser)
m_ParamValues.Add(entParser->Parse(pvalue));
else
m_ParamValues.Add(pvalue);
} }
break; break;
} }
@@ -259,7 +262,10 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos,
// but wxHTML code relies on this... :( // but wxHTML code relies on this... :(
pvalue.MakeUpper(); pvalue.MakeUpper();
} }
m_ParamValues.Add(entParser->Parse(pvalue)); if (entParser)
m_ParamValues.Add(entParser->Parse(pvalue));
else
m_ParamValues.Add(pvalue);
state = ST_BEFORE_NAME; state = ST_BEFORE_NAME;
} }
else else