From 367c84b903487509202a6d8d9e847892bcf1b832 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 2 Jul 2001 13:01:30 +0000 Subject: [PATCH] oops, fixed fatal bug in new HTML parsing code (I wonder why it didn't crash when I played with it yesterday...) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/htmlpars.cpp | 2 +- src/html/htmltag.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp index dc572b0a89..1b9c06726d 100644 --- a/src/html/htmlpars.cpp +++ b/src/html/htmlpars.cpp @@ -110,7 +110,7 @@ void wxHtmlParser::DoParsing(int begin_pos, int end_pos) 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) { diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index 8801b15227..52e0c1b8f8 100644 --- a/src/html/htmltag.cpp +++ b/src/html/htmltag.cpp @@ -206,7 +206,10 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, else if (state == ST_VALUE && quote == 0) { m_ParamNames.Add(pname); - m_ParamValues.Add(entParser->Parse(pvalue)); + if (entParser) + m_ParamValues.Add(entParser->Parse(pvalue)); + else + m_ParamValues.Add(pvalue); } break; } @@ -259,7 +262,10 @@ wxHtmlTag::wxHtmlTag(const wxString& source, int pos, int end_pos, // but wxHTML code relies on this... :( 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; } else -- 2.45.2