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

Stricter syntax checking of the %V tag - pay attention to the return-code from parse_list, and check for the tailing | symbol.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16784 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2008-03-24 18:40:13 +00:00
parent 10e1acc7ad
commit 0bb2e05aef
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
apps/gui/wps_parser.c
View file

@ -26,6 +26,7 @@
#include "gwps.h" #include "gwps.h"
#ifndef __PCTOOL__ #ifndef __PCTOOL__
#include "settings.h" #include "settings.h"
#include "misc.h"
#include "debug.h" #include "debug.h"
#include "plugin.h" #include "plugin.h"
@ -562,28 +563,35 @@ static int parse_viewport(const char *wps_bufptr,
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
if (depth == 16) if (depth == 16)
{ {
parse_list("dddddcc", '|', ptr, &vp->x, &vp->y, &vp->width, if (!(ptr = parse_list("dddddcc", '|', ptr, &vp->x, &vp->y, &vp->width,
&vp->height, &vp->font, &vp->fg_pattern,&vp->bg_pattern); &vp->height, &vp->font, &vp->fg_pattern,&vp->bg_pattern)))
return WPS_ERROR_INVALID_PARAM;
} }
else else
#endif #endif
#if (LCD_DEPTH == 2) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 2) #if (LCD_DEPTH == 2) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 2)
if (depth == 2) { if (depth == 2) {
parse_list("dddddgg", '|', ptr, &vp->x, &vp->y, &vp->width, if (!(ptr = parse_list("dddddgg", '|', ptr, &vp->x, &vp->y, &vp->width,
&vp->height, &vp->font, &vp->fg_pattern, &vp->bg_pattern); &vp->height, &vp->font, &vp->fg_pattern, &vp->bg_pattern)))
return WPS_ERROR_INVALID_PARAM;
} }
else else
#endif #endif
#if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1) #if (LCD_DEPTH == 1) || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH == 1)
if (depth == 1) if (depth == 1)
{ {
parse_list("ddddd", '|', ptr, &vp->x, &vp->y, &vp->width, &vp->height, if (!(ptr = parse_list("ddddd", '|', ptr, &vp->x, &vp->y, &vp->width,
&vp->font); &vp->height, &vp->font)))
return WPS_ERROR_INVALID_PARAM;
} }
else else
#endif #endif
{} {}
/* Check for trailing | */
if (*ptr != '|')
return WPS_ERROR_INVALID_PARAM;
/* Default to using the user font if the font was an invalid number */ /* Default to using the user font if the font was an invalid number */
if ((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI)) if ((vp->font != FONT_SYSFIXED) && (vp->font != FONT_UI))
vp->font = FONT_UI; vp->font = FONT_UI;