From: Vadim Zeitlin Date: Thu, 1 Nov 2012 17:15:12 +0000 (+0000) Subject: Don't crash in wxHTML when parsing empty tables with empty width parameter. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/18764039ab9c63717297b3132fac826e4c17f063 Don't crash in wxHTML when parsing empty tables with empty width parameter. Guard against accessing invalid string element. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index 7bca5a4c3f..825329b2ca 100644 --- a/src/html/m_tables.cpp +++ b/src/html/m_tables.cpp @@ -288,7 +288,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag) { wxString wd = tag.GetParam(wxT("WIDTH")); - if (wd[wd.length()-1] == wxT('%')) + if (!wd.empty() && wd[wd.length()-1] == wxT('%')) { if ( wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width) == 1 ) { @@ -704,7 +704,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") { wxString wd = tag.GetParam(wxT("WIDTH")); - if (wd[wd.length()-1] == wxT('%')) + if (!wd.empty() && wd[wd.length()-1] == wxT('%')) { int width = 0; wxSscanf(wd.c_str(), wxT("%i%%"), &width);