p
/
nncmpp
1
1
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Improve the MPD time parser 

- reject negative values, which strtoul() happily accepts
 - deal with an arbitrary number of decimal digits
 - don't return milliseconds when we fail to parse seconds
This commit is contained in:
Přemysl Eric Janouch 2020-10-24 08:20:24 +02:00
parent 3934d9b1f9
commit c0119027b1
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nncmpp.c
View File

@ -3358,18 +3358,27 @@ mpd_read_time (const char *value, int *sec, int *optional_msec)
if (!value) if (!value)
return; return;
char *end, *period = strchr (value, '.'); char *end = NULL;
if (optional_msec && period) long n = strtol (value, &end, 10);
{ if (n < 0 || (*end && *end != '.'))
unsigned long n = strtoul (period + 1, &end, 10);
if (*end)
return; return;
// XXX: this relies on three decimal places
*optional_msec = MIN (INT_MAX, n); int msec = 0;
if (*end == '.')
{
// In practice, MPD always uses three decimal digits
size_t digits = strspn (++end, "0123456789");
if (end[digits])
return;
if (digits--) msec += (*end++ - '0') * 100;
if (digits--) msec += (*end++ - '0') * 10;
if (digits--) msec += *end++ - '0';
} }
unsigned long n = strtoul (value, &end, 10);
if (end == period || !*end)
*sec = MIN (INT_MAX, n); *sec = MIN (INT_MAX, n);
if (optional_msec)
*optional_msec = msec;
} }
static void static void