handle other errors in parseMedia

Author: thijstriemstra

encode/tests/test_util.py

@@ -97,10 +97,13 @@ def test_goodData(self):
 
     def test_badData(self):
         """
-        Passing corrupt data to `parseMedia` raises a
+        Passing corrupt or unsupported data to `parseMedia` raises a
         :py:class:`~encode.DecodeError`.
         """
         self.assertRaises(DecodeError, util.parseMedia, 'foo')
+        self.assertRaises(DecodeError, util.parseMedia, {})
+        self.assertRaises(DecodeError, util.parseMedia, [])
+        self.assertRaises(DecodeError, util.parseMedia, ())
 
 
 class VersionTestCase(WebTest):

encode/util.py

@@ -100,15 +100,16 @@ def parseMedia(data):
     """
     #logger.debug("Got frame data: %s" % str(len(data)))
     #logger.debug("Data URI header: %s" % data[0:40])
-    header_len = data.find(",")
-    payload = data[header_len + 1:]
 
     try:
+        header_len = data.find(",")
+        payload = data[header_len + 1:]
         binary = b64decode(payload)
         #logger.debug("Binary id: %s" % binary[0:4])
+
         return binary
 
-    except (TypeError, binascii.Error):
+    except (AttributeError, TypeError, binascii.Error):
         # corrupt media
         raise DecodeError("Corrupt media")