id3: don't leak IndexError on invalid encoding fields. (Fixes issue #211

)
quodlibet · Feb 6, 2015 · 53d3f3a · 53d3f3a
1 parent bafc12b
commit 53d3f3a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/mutagen/id3/_specs.py b/mutagen/id3/_specs.py
@@ -92,6 +92,8 @@ class EncodingSpec(ByteSpec):
     def read(self, frame, data):
         enc, data = super(EncodingSpec, self).read(frame, data)
         if enc < 16:
+            if enc > 3:
+                raise ID3JunkFrameError("invalid encoding")
             return enc, data
         else:
             return 0, chr_(enc) + data

diff --git a/tests/test__id3specs.py b/tests/test__id3specs.py
@@ -3,7 +3,7 @@
 from tests import TestCase, add
 
 from mutagen._compat import PY2, PY3, text_type
-from mutagen.id3 import BitPaddedInt, unsynch
+from mutagen.id3 import BitPaddedInt, unsynch, ID3JunkFrameError
 
 
 class SpecSanityChecks(TestCase):
@@ -21,6 +21,7 @@ def test_encodingspec(self):
         s = EncodingSpec('name')
         self.assertEquals((0, b'abcdefg'), s.read(None, b'abcdefg'))
         self.assertEquals((3, b'abcdefg'), s.read(None, b'\x03abcdefg'))
+        self.assertRaises(ID3JunkFrameError, s.read, None, b'\x04abcdefg')
         self.assertEquals(b'\x00', s.write(None, 0))
         self.assertRaises(TypeError, s.write, None, b'abc')
         self.assertRaises(TypeError, s.write, None, None)

diff --git a/tests/test_id3.py b/tests/test_id3.py
@@ -272,7 +272,7 @@ def loaded_frame(self, tag):
 
     def test_badencoding(self):
         self.assertRaises(
-            IndexError, Frames["TPE1"].fromData, _24, 0, b"\x09ab")
+            ID3JunkFrameError, Frames["TPE1"].fromData, _24, 0, b"\x09ab")
         self.assertRaises(ValueError, Frames["TPE1"], encoding=9, text="ab")
 
     def test_badsync(self):