Merge pull request #295 from vadmium/buffer

Fix memory overwriting issue caused by buffer rework

src/livestreamer/buffers.py

@@ -50,9 +50,7 @@ def _iterate_chunks(self, size):
 
     def write(self, data):
         if not self.closed:
-            if isinstance(data, bytearray):
-                data = bytes(data)
-
+            data = bytes(data)  # Copy so that original buffer may be reused
             self.chunks.append(data)
             self.length += len(data)
 

tests/test_buffer.py

@@ -46,6 +46,25 @@ def test_close(self):
         self.buffer.close()
         self.buffer.write(b"2" * 8192)
         self.assertEqual(self.buffer.length, 8192)
+
+    def test_reuse_input(self):
+        """Objects should be reusable after write()"""
+
+        original = b"original"
+        tests = [bytearray(original)]
+        try:
+            m = memoryview(bytearray(original))
+        except NameError:  # Python 2.6 does not have "memoryview"
+            pass
+        else:
+            # Python 2.7 doesn't do bytes(memoryview) properly
+            if bytes(m) == original:
+                tests.append(m)
+
+        for data in tests:
+            self.buffer.write(data)
+            data[:] = b"reused!!"
+            self.assertEqual(self.buffer.read(), original)
 
 
 if __name__ == "__main__":