Merge pull request msgpack#165 from frsyuki/fix-string-too-large-message

methane · methane · commit 151a16d216e8 · 2016-01-12T10:26:11.000+09:00
Fix wrong 'dict is too large' on unicode string
diff --git a/msgpack/_packer.pyx b/msgpack/_packer.pyx
@@ -174,11 +174,11 @@ cdef class Packer(object):
                 o = PyUnicode_AsEncodedString(o, self.encoding, self.unicode_errors)
                 L = len(o)
                 if L > (2**32)-1:
-                    raise ValueError("dict is too large")
+                    raise ValueError("unicode string is too large")
                 rawval = o
-                ret = msgpack_pack_raw(&self.pk, len(o))
+                ret = msgpack_pack_raw(&self.pk, L)
                 if ret == 0:
-                    ret = msgpack_pack_raw_body(&self.pk, rawval, len(o))
+                    ret = msgpack_pack_raw_body(&self.pk, rawval, L)
             elif PyDict_CheckExact(o):
                 d = <dict>o
                 L = len(d)
