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

Don't crash in wxHTML when parsing empty tables with empty width parameter.

Browse Source 
Guard against accessing invalid string element.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-01 17:15:12 +00:00
parent 84605707d1
commit 18764039ab
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/html/m_tables.cpp
View File

@@ -288,7 +288,7 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
{ {
wxString wd = tag.GetParam(wxT("WIDTH")); 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 ) 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")); wxString wd = tag.GetParam(wxT("WIDTH"));
if (wd[wd.length()-1] == wxT('%')) if (!wd.empty() && wd[wd.length()-1] == wxT('%'))
{ {
int width = 0; int width = 0;
wxSscanf(wd.c_str(), wxT("%i%%"), &width); wxSscanf(wd.c_str(), wxT("%i%%"), &width);