fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

snd_mp3tag.c: check for false positives if id3v1 is not at file's end.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1665 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2019-12-29 16:50:06 +00:00
parent a1eff43d80
commit 65825de11a
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Quake/snd_mp3tag.c
View file

@ -25,7 +25,7 @@
static inline qboolean is_id3v1(const unsigned char *data, long length) { static inline qboolean is_id3v1(const unsigned char *data, long length) {
/* http://id3.org/ID3v1 : 3 bytes "TAG" identifier and 125 bytes tag data */ /* http://id3.org/ID3v1 : 3 bytes "TAG" identifier and 125 bytes tag data */
if (length < 3 || memcmp(data,"TAG",3) != 0) { if (length < 128 || memcmp(data,"TAG",3) != 0) {
return false; return false;
} }
return true; return true;
@ -237,12 +237,19 @@ static long get_musicmatch_len(snd_stream_t *stream) {
return len + 256; /* header is present. */ return len + 256; /* header is present. */
} }
static int probe_id3v1(snd_stream_t *stream, unsigned char *buf) { static int probe_id3v1(snd_stream_t *stream, unsigned char *buf, int atend) {
if (stream->fh.length >= 128) { if (stream->fh.length >= 128) {
FS_fseek(&stream->fh, -128, SEEK_END); FS_fseek(&stream->fh, -128, SEEK_END);
if (FS_fread(buf, 1, 128, &stream->fh) != 128) if (FS_fread(buf, 1, 128, &stream->fh) != 128)
return -1; return -1;
if (is_id3v1(buf, 128)) { if (is_id3v1(buf, 128)) {
if (!atend) { /* possible false positive? */
if (is_musicmatch(buf + 128 - 48, 48) ||
is_apetag (buf + 128 - 32, 32) ||
is_lyrics3tag(buf + 128 - 15, 15)) {
return 0;
}
}
stream->fh.length -= 128; stream->fh.length -= 128;
Con_DPrintf("MP3: skipped %ld bytes ID3v1 tag\n", 128L); Con_DPrintf("MP3: skipped %ld bytes ID3v1 tag\n", 128L);
return 1; return 1;
@ -359,7 +366,7 @@ int mp3_skiptags(snd_stream_t *stream)
goto fail; goto fail;
} }
/* ID3v1 tag is at the end */ /* ID3v1 tag is at the end */
if ((c_id3 = probe_id3v1(stream, buf)) < 0) { if ((c_id3 = probe_id3v1(stream, buf, !c_mm)) < 0) {
goto fail; goto fail;
} }
/* we do not know the order of ape or lyrics3 /* we do not know the order of ape or lyrics3
@ -395,5 +402,4 @@ int mp3_skiptags(snd_stream_t *stream)
FS_rewind(&stream->fh); FS_rewind(&stream->fh);
return rc; return rc;
} }
#endif /* USE_CODEC_MP3 */ #endif /* USE_CODEC_MP3 */