summaryrefslogtreecommitdiffstats
path: root/apps/gui/skin_engine/skin_parser.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui/skin_engine/skin_parser.c')
-rw-r--r--apps/gui/skin_engine/skin_parser.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index ede1871414..b03bdb013d 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -983,18 +983,9 @@ static int parse_albumart_load(const char *wps_bufptr,
return WPS_ERROR_INVALID_PARAM; /* malformed token: e.g. %Cl7 */
_pos = wps_bufptr + 1;
- if (!isdigit(*_pos))
- return WPS_ERROR_INVALID_PARAM; /* malformed token: e.g. %Cl|@ */
- aa->albumart_x = atoi(_pos);
+ _pos = parse_list("dd", NULL, '|', _pos, &aa->albumart_x, &aa->albumart_y);
- _pos = strchr(_pos, '|');
- if (!_pos || _pos > newline || !isdigit(*(++_pos)))
- return WPS_ERROR_INVALID_PARAM; /* malformed token: e.g. %Cl|7\n or %Cl|7|@ */
-
- aa->albumart_y = atoi(_pos);
-
- _pos = strchr(_pos, '|');
- if (!_pos || _pos > newline)
+ if (!_pos || _pos > newline || *_pos != '|')
return WPS_ERROR_INVALID_PARAM; /* malformed token: no | after y coordinate
e.g. %Cl|7|59\n */