tag/{aiff,riff}: fix ID3 chunk padding

Apply padding only to the fseek(), not to the chunk size. This fixes bogus "failed to read riff chunk" messages when the last chunk has an odd size. See http://bugs.musicpd.org/view.php?id=4486

tag/{aiff,riff}: fix ID3 chunk padding
4abcb08c · Max Kellermann · 81e78337 · 4abcb08c · 4abcb08c · 4abcb08c
Commit 4abcb08c authored Feb 19, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

NEWS NEWS +2 -0

Aiff.cxx src/tag/Aiff.cxx +4 -4

Riff.cxx src/tag/Riff.cxx +4 -4

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.19.13 (not yet released)
+* tags
+  - aiff, riff: fix ID3 chunk padding

 ver 0.19.12 (2015/12/15)
 * fix assertion failure on malformed UTF-8 tag

--- a/src/tag/Aiff.cxx
+++ b/src/tag/Aiff.cxx
@@ -84,14 +84,14 @@ aiff_seek_id3(FILE *file)
 			   underflow when casting to off_t */
 			return 0;

-		if (size % 2 != 0)
-			/* pad byte */
-			++size;
-
 		if (memcmp(chunk.id, "ID3 ", 4) == 0)
 			/* found it! */
 			return size;

+		if (size % 2 != 0)
+			/* pad byte */
+			++size;
+
 		if (fseek(file, size, SEEK_CUR) != 0)
 			return 0;
 	}

--- a/src/tag/Riff.cxx
+++ b/src/tag/Riff.cxx
@@ -82,15 +82,15 @@ riff_seek_id3(FILE *file)
 			   underflow when casting to off_t */
 			return 0;

-		if (size % 2 != 0)
-			/* pad byte */
-			++size;
-
 		if (memcmp(chunk.id, "id3 ", 4) == 0 ||
 		    memcmp(chunk.id, "ID3 ", 4) == 0)
 			/* found it! */
 			return size;

+		if (size % 2 != 0)
+			/* pad byte */
+			++size;
+
 		if (fseek(file, size, SEEK_CUR) != 0)
 			return 0;
 	}