From: Václav Slavík <vslavik@fastmail.fm>
Date: Sun, 4 May 2008 09:36:33 +0000 (+0000)
Subject: check tables width parameter for invalid values
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e388dc214c74a5ac2d3c4d5f810fcfbd5f7fa01a

check tables width parameter for invalid values

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index f50de26c79..c5d63e6020 100644
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -282,14 +282,19 @@ void wxHtmlTableCell::AddCell(wxHtmlContainerCell *cell, const wxHtmlTag& tag)
 
             if (wd[wd.length()-1] == wxT('%'))
             {
-                wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width);
-                m_ColsInfo[c].units = wxHTML_UNITS_PERCENT;
+                if ( wxSscanf(wd.c_str(), wxT("%i%%"), &m_ColsInfo[c].width) == 1 )
+                {
+                    m_ColsInfo[c].units = wxHTML_UNITS_PERCENT;
+                }
             }
             else
             {
-                wxSscanf(wd.c_str(), wxT("%i"), &m_ColsInfo[c].width);
-                m_ColsInfo[c].width = (int)(m_PixelScale * (double)m_ColsInfo[c].width);
-                m_ColsInfo[c].units = wxHTML_UNITS_PIXELS;
+                long width;
+                if ( wd.ToLong(&width) )
+                {
+                    m_ColsInfo[c].width = (int)(m_PixelScale * (double)width);
+                    m_ColsInfo[c].units = wxHTML_UNITS_PIXELS;
+                }
             }
         }
     }