Fix size limit on pack_array_header and pack_map_header.

methane · methane · commit ef5d93d4eaaa · 2014-03-26T11:05:53.000+09:00
diff --git a/msgpack/_packer.pyx b/msgpack/_packer.pyx
@@ -238,7 +238,7 @@ cdef class Packer(object):
         msgpack_pack_raw_body(&self.pk, data, len(data))
 
     def pack_array_header(self, size_t size):
-        if size >= (2**32-1):
+        if size > (2**32-1):
             raise ValueError
         cdef int ret = msgpack_pack_array(&self.pk, size)
         if ret == -1:
@@ -251,7 +251,7 @@ cdef class Packer(object):
             return buf
 
     def pack_map_header(self, size_t size):
-        if size >= (2**32-1):
+        if size > (2**32-1):
             raise ValueError
         cdef int ret = msgpack_pack_map(&self.pk, size)
         if ret == -1:
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
@@ -633,6 +633,8 @@ def pack_map_pairs(self, pairs):
         return ret
 
     def pack_array_header(self, n):
+        if n >= 2**32:
+            raise ValueError
         self._fb_pack_array_header(n)
         ret = self._buffer.getvalue()
         if self._autoreset:
@@ -642,6 +644,8 @@ def pack_array_header(self, n):
         return ret
 
     def pack_map_header(self, n):
+        if n >= 2**32:
+            raise ValueError
         self._fb_pack_map_header(n)
         ret = self._buffer.getvalue()
         if self._autoreset:
