oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.19.x'

Browse Source
This commit is contained in:
Max Kellermann 2016-02-19 18:16:04 +01:00
commit 0acc88cde5
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@ -47,6 +47,12 @@ ver 0.20 (not yet released)
* update * update
- apply .mpdignore matches to subdirectories - apply .mpdignore matches to subdirectories
ver 0.19.13 (not yet released)
* tags
- aiff, riff: fix ID3 chunk padding
* decoder
- ffmpeg: support the TAK codec
ver 0.19.12 (2015/12/15) ver 0.19.12 (2015/12/15)
* fix assertion failure on malformed UTF-8 tag * fix assertion failure on malformed UTF-8 tag
* fix build failure on non-Linux systems * fix build failure on non-Linux systems

8
src/tag/Aiff.cxx
View File

@ -84,14 +84,14 @@ aiff_seek_id3(FILE *file)
underflow when casting to off_t */ underflow when casting to off_t */
return 0; return 0;
if (size % 2 != 0)
/* pad byte */
++size;
if (memcmp(chunk.id, "ID3 ", 4) == 0) if (memcmp(chunk.id, "ID3 ", 4) == 0)
/* found it! */ /* found it! */
return size; return size;
if (size % 2 != 0)
/* pad byte */
++size;
if (fseek(file, size, SEEK_CUR) != 0) if (fseek(file, size, SEEK_CUR) != 0)
return 0; return 0;
} }

8
src/tag/Riff.cxx
View File

@ -82,15 +82,15 @@ riff_seek_id3(FILE *file)
underflow when casting to off_t */ underflow when casting to off_t */
return 0; return 0;
if (size % 2 != 0)
/* pad byte */
++size;
if (memcmp(chunk.id, "id3 ", 4) == 0 || if (memcmp(chunk.id, "id3 ", 4) == 0 ||
memcmp(chunk.id, "ID3 ", 4) == 0) memcmp(chunk.id, "ID3 ", 4) == 0)
/* found it! */ /* found it! */
return size; return size;
if (size % 2 != 0)
/* pad byte */
++size;
if (fseek(file, size, SEEK_CUR) != 0) if (fseek(file, size, SEEK_CUR) != 0)
return 0; return 0;
} }