len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 21:25:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor line handling fixes, be smarter (well dumber actually) about increasing the size of the tokens array, that loop isnt the only place the data->num_tokens variable gets increased... also add one last WPS_NO_TOKEN token to the end to make sure we dont accidently overrun into the next skin on the last line of a skin.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22618 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2009-09-04 06:17:38 +00:00
parent ae181ca0ca
commit d466cb9beb
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/gui/skin_engine/skin_parser.c
View file

@ -668,7 +668,8 @@ static int parse_viewport(const char *wps_bufptr,
skin_vp->label = VP_NO_LABEL; skin_vp->label = VP_NO_LABEL;
skin_vp->pb = NULL; skin_vp->pb = NULL;
skin_vp->lines = NULL; skin_vp->lines = NULL;
if (curr_line)
curr_line->curr_subline->last_token_idx = wps_data->num_tokens;
curr_line = NULL; curr_line = NULL;
if (!skin_start_new_line(skin_vp, wps_data->num_tokens)) if (!skin_start_new_line(skin_vp, wps_data->num_tokens))
return WPS_ERROR_INVALID_PARAM; return WPS_ERROR_INVALID_PARAM;
@ -1346,7 +1347,7 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr, bool debug)
while (*wps_bufptr && !fail) while (*wps_bufptr && !fail)
{ {
/* first make sure there is enough room for tokens */ /* first make sure there is enough room for tokens */
if (max_tokens -1 == data->num_tokens) if (max_tokens <= data->num_tokens + 5)
{ {
int extra_tokens = TOKEN_BLOCK_SIZE; int extra_tokens = TOKEN_BLOCK_SIZE;
size_t needed = extra_tokens * sizeof(struct wps_token); size_t needed = extra_tokens * sizeof(struct wps_token);
@ -1552,12 +1553,12 @@ static bool wps_parse(struct wps_data *data, const char *wps_bufptr, bool debug)
fail = PARSE_FAIL_LIMITS_EXCEEDED; fail = PARSE_FAIL_LIMITS_EXCEEDED;
/* Success! */ /* Success! */
curr_line->curr_subline->last_token_idx = data->num_tokens;
data->tokens[data->num_tokens++].type = WPS_NO_TOKEN;
/* freeup unused tokens */ /* freeup unused tokens */
skin_buffer_free_from_front(sizeof(struct wps_token) skin_buffer_free_from_front(sizeof(struct wps_token)
* (max_tokens - data->num_tokens)); * (max_tokens - data->num_tokens));
/* close the last subline */
curr_line->curr_subline->last_token_idx = data->num_tokens;
#if defined(DEBUG) || defined(SIMULATOR) #if defined(DEBUG) || defined(SIMULATOR)
if (debug) if (debug)
print_debug_info(data, fail, line_number); print_debug_info(data, fail, line_number);