devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Hopefully get the viewport position/dimensions validation correct this time.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16782 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2008-03-24 14:58:30 +00:00
parent 196899ebfd
commit 2a34943d7f
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/gui/wps_parser.c
View file

@ -593,8 +593,10 @@ static int parse_viewport(const char *wps_bufptr,
#ifdef HAVE_REMOTE_LCD
if (wps_data->remote_wps)
{
if (((vp->x + vp->width) >= LCD_REMOTE_WIDTH) ||
((vp->y + vp->height) >= LCD_REMOTE_HEIGHT))
if ((vp->x >= LCD_REMOTE_WIDTH) ||
((vp->x + vp->width) > LCD_REMOTE_WIDTH) ||
(vp->y >= LCD_REMOTE_HEIGHT) ||
((vp->y + vp->height) > LCD_REMOTE_HEIGHT))
{
return WPS_ERROR_INVALID_PARAM;
}
@ -602,8 +604,10 @@ static int parse_viewport(const char *wps_bufptr,
else
#else
{
if (((vp->x + vp->width) >= LCD_WIDTH) ||
((vp->y + vp->height) >= LCD_HEIGHT))
if ((vp->x >= LCD_WIDTH) ||
((vp->x + vp->width) > LCD_WIDTH) ||
(vp->y >= LCD_HEIGHT) ||
((vp->y + vp->height) > LCD_HEIGHT))
{
return WPS_ERROR_INVALID_PARAM;
}