do not accept multi-byte types in unpackb

jfolz · jfolz · commit 249e051ddb3d · 2016-05-15T11:58:19.000+02:00
diff --git a/msgpack/_unpacker.pyx b/msgpack/_unpacker.pyx
@@ -141,10 +141,11 @@ def unpackb(object packed, object object_hook=None, object list_hook=None,
     if PyObject_CheckBuffer(packed):
         buffer_supported = 1
         if PyObject_GetBuffer(packed, &view, PyBUF_SIMPLE) == 0:
-            buf = <char*> view.buf
+            if view.itemsize != 1:
+                PyBuffer_Release(&view)
+                raise ValueError("cannot unpack from multi-byte object")
             buf_len = view.len
-        else:
-            raise
+            buf = <char*> view.buf
     else:
         PyObject_AsReadBuffer(packed, <const void**>&buf, &buf_len)
         PyErr_WarnEx(DeprecationWarning,
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
@@ -259,7 +259,8 @@ def feed(self, next_bytes):
                               DeprecationWarning)
             else:
                 raise
-        assert view.itemsize == 1
+        if view.itemsize != 1:
+            raise ValueError("cannot unpack from multi-byte object")
         L = len(view)
         if self._fb_buf_n + L - self._fb_sloppiness > self._max_buffer_size:
             raise BufferFull
