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

Make the FLAC metadata parser a little more robust.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15093 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2007-10-13 11:21:10 +00:00
parent c9bd970ad6
commit 5fc117ea4e
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/metadata/flac.c
View file

@ -38,6 +38,7 @@ bool get_flac_metadata(int fd, struct mp3entry* id3)
/* Use the trackname part of the id3 structure as a temporary buffer */ /* Use the trackname part of the id3 structure as a temporary buffer */
unsigned char* buf = (unsigned char *)id3->path; unsigned char* buf = (unsigned char *)id3->path;
bool last_metadata = false;
bool rc = false; bool rc = false;
if (!skip_id3v2(fd, id3) || (read(fd, buf, 4) < 4)) if (!skip_id3v2(fd, id3) || (read(fd, buf, 4) < 4))
@ -50,24 +51,26 @@ bool get_flac_metadata(int fd, struct mp3entry* id3)
return rc; return rc;
} }
while (true) while (!last_metadata)
{ {
long i; unsigned long i;
int type;
if (read(fd, buf, 4) < 0) if (read(fd, buf, 4) < 0)
{ {
return rc; return rc;
} }
last_metadata = buf[0] & 0x80;
type = buf[0] & 0x7f;
/* The length of the block */ /* The length of the block */
i = (buf[1] << 16) | (buf[2] << 8) | buf[3]; i = (buf[1] << 16) | (buf[2] << 8) | buf[3];
if ((buf[0] & 0x7f) == 0) /* 0 is the STREAMINFO block */ if (type == 0) /* 0 is the STREAMINFO block */
{ {
unsigned long totalsamples; unsigned long totalsamples;
/* FIXME: Don't trust the value of i */ if (i >= sizeof(id3->path) || read(fd, buf, i) < 0)
if (read(fd, buf, i) < 0)
{ {
return rc; return rc;
} }
@ -92,7 +95,7 @@ bool get_flac_metadata(int fd, struct mp3entry* id3)
id3->bitrate = (id3->filesize * 8) / id3->length; id3->bitrate = (id3->filesize * 8) / id3->length;
} }
else if ((buf[0] & 0x7f) == 4) /* 4 is the VORBIS_COMMENT block */ else if (type == 4) /* 4 is the VORBIS_COMMENT block */
{ {
/* The next i bytes of the file contain the VORBIS COMMENTS. */ /* The next i bytes of the file contain the VORBIS COMMENTS. */
if (!read_vorbis_tags(fd, id3, i)) if (!read_vorbis_tags(fd, id3, i))
@ -100,14 +103,7 @@ bool get_flac_metadata(int fd, struct mp3entry* id3)
return rc; return rc;
} }
} }
else else if (!last_metadata)
{
if (buf[0] & 0x80)
{
/* If we have reached the last metadata block, abort. */
break;
}
else
{ {
/* Skip to next metadata block */ /* Skip to next metadata block */
if (lseek(fd, i, SEEK_CUR) < 0) if (lseek(fd, i, SEEK_CUR) < 0)
@ -116,7 +112,6 @@ bool get_flac_metadata(int fd, struct mp3entry* id3)
} }
} }
} }
}
return true; return true;
} }