AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check the number of points in the image map in wxHTML.

Browse Source 
Don't crash if an <area> element is incorrect and doesn't have the required
number of coords attributes.

Closes #15348.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-07-17 17:27:09 +00:00
parent 4cdb8e430c
commit 2767360fa8
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/changes.txt
View File

@ -557,6 +557,14 @@ Major new features in this release
was added. was added.
3.0: (released 2013-09-??)
--------------------------
All (GUI):
- Fix crash in wxHTML on mal-formed <area> elements (LukasK).
2.9.5: (released 2013-07-15) 2.9.5: (released 2013-07-15)
---------------------------- ----------------------------

4
src/html/m_image.cpp
View File

@ -95,6 +95,7 @@ wxHtmlLinkInfo *wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
switch (type) switch (type)
{ {
case RECT: case RECT:
if ( coords.GetCount() == 4 )
{ {
int l, t, r, b; int l, t, r, b;
@ -106,9 +107,10 @@ wxHtmlLinkInfo *wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
{ {
return m_Link; return m_Link;
} }
break;
} }
break;
case CIRCLE: case CIRCLE:
if ( coords.GetCount() == 3 )
{ {
int l, t, r; int l, t, r;
double d; double d;