Merge pull request #674 from kism/fix-ogg-trailing-null-bytes

Fix for ogg trailing null bytes

Author: phw

mutagen/ogg.py

@@ -81,6 +81,12 @@ def __init__(self, fileobj=None):
         self.offset = fileobj.tell()
 
         header = fileobj.read(27)
+
+        # If there is not enough data to make up the header...
+        # we might be looking at trailing null bytes on the file.
+        if len(header) < 27 and all(byte == 0 for byte in header):
+            raise EOFError
+
         if len(header) == 0:
             raise EOFError
 

tests/test_ogg.py

@@ -261,6 +261,24 @@ def test_renumber_reread(self):
         finally:
             os.unlink(filename)
 
+    def test_renumber_reread_trailing_bytes(self):
+        try:
+            filename = get_temp_copy(
+                os.path.join(DATA_DIR, "multipagecomment.ogg"))
+
+            # Append some trailing bytes to the file
+            with open(filename, "rb+") as fileobj:
+                fileobj.seek(0, 2)
+                fileobj.write(b"\x00" * 2)
+
+            with open(filename, "rb+") as fileobj:
+                OggPage.renumber(fileobj, 1002429366, 20)
+
+            with open(filename, "rb+") as fileobj:
+                OggPage.renumber(fileobj, 1002429366, 0)
+        finally:
+            os.unlink(filename)
+
     def test_renumber_muxed(self):
         pages = [OggPage() for i in range(10)]
         for seq, page in enumerate(pages[0:1] + pages[2:]):