Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cuesheet.c Fix potential NULL in INDEX parsing

Browse source 
untested

Change-Id: I6160348eeece364e3242f047437877ea34136f9c
This commit is contained in:
William Wilgus 2021-07-29 07:26:40 -04:00 committed by William Wilgus
parent 7318d393ea
commit ea438ee132
1 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
apps/cuesheet.c
View file

@ -118,6 +118,53 @@ static char *get_string(const char *line)
return start; return start;
} }
static unsigned long parse_cue_index(const char *line)
{
/* assumes strncmp(line, "INDEX 01", 8) & NULL terminated string */
/* INDEX 01 MM:SS:FF\0 (00:00:00\0 - 99:99:99\0)*/
const unsigned field_m[3] = {60 * 1000, 1000, 13}; /* MM:SS:~FF*/
const char f_sep = ':';
int field = -1;
unsigned long offset = 0; /* ms from start of track */
unsigned long value = 0;
while (*line)
{
if (!isdigit(*line)) /* search for numbers */
{
line++;
continue;
}
while (isdigit(*line))
{
value = 10 * value + (*line - '0');
if (value > 99) /* Sanity check bail early */
return 0;
line++;
}
if (field < 0) /*Filter INDEX 01*/
{
/* safe to assume value == 1 */
}
else if (field <= 2)
{
while(*line && *line != f_sep)
line++;
if (*line || field == 2) /* if *line valid we found f_sep */
offset += (unsigned long) field_m[field] * value;
}
else
break;
value = 0;
field++;
}
return offset;
}
/* parse cuesheet "cue_file" and store the information in "cue" */ /* parse cuesheet "cue_file" and store the information in "cue" */
bool parse_cuesheet(struct cuesheet_file *cue_file, struct cuesheet *cue) bool parse_cuesheet(struct cuesheet_file *cue_file, struct cuesheet *cue)
{ {
@ -204,6 +251,7 @@ bool parse_cuesheet(struct cuesheet_file *cue_file, struct cuesheet *cue)
} }
else if (!strncmp(s, "INDEX 01", 8)) else if (!strncmp(s, "INDEX 01", 8))
{ {
#if 0
s = strchr(s,' '); s = strchr(s,' ');
s = skip_whitespace(s); s = skip_whitespace(s);
s = strchr(s,' '); s = strchr(s,' ');
@ -213,6 +261,9 @@ bool parse_cuesheet(struct cuesheet_file *cue_file, struct cuesheet *cue)
cue->tracks[cue->track_count-1].offset += 1000 * atoi(s); cue->tracks[cue->track_count-1].offset += 1000 * atoi(s);
s = strchr(s,':') + 1; s = strchr(s,':') + 1;
cue->tracks[cue->track_count-1].offset += 13 * atoi(s); cue->tracks[cue->track_count-1].offset += 13 * atoi(s);
#else
cue->tracks[cue->track_count-1].offset = parse_cue_index(s);
#endif
} }
else if (!strncmp(s, "TITLE", 5) else if (!strncmp(s, "TITLE", 5)
|| !strncmp(s, "PERFORMER", 9) || !strncmp(s, "PERFORMER", 9)