Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2026-04-12 22:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #135 from pramukta/default_function_on_int_overflow

Browse source 
Default function on int overflow
This commit is contained in:
INADA Naoki 2015-11-09 02:23:22 +09:00
commit ca87a7e539
3 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
msgpack/_packer.pyx
View file

@ -136,12 +136,20 @@ cdef class Packer(object):
elif PyLong_Check(o):
# PyInt_Check(long) is True for Python 3.
# Sow we should test long before int.
if o > 0:
ullval = o
ret = msgpack_pack_unsigned_long_long(&self.pk, ullval)
else:
llval = o
ret = msgpack_pack_long_long(&self.pk, llval)
try:
if o > 0:
ullval = o
ret = msgpack_pack_unsigned_long_long(&self.pk, ullval)
else:
llval = o
ret = msgpack_pack_long_long(&self.pk, llval)
except OverflowError, oe:
if not default_used and self._default is not None:
o = self._default(o)
default_used = True
continue
else:
raise
elif PyInt_Check(o):
longval = o
ret = msgpack_pack_long(&self.pk, longval)

4
msgpack/fallback.py
View file

@ -655,6 +655,10 @@ class Packer(object):
return self._buffer.write(struct.pack(">BQ", 0xcf, obj))
if -0x8000000000000000 <= obj < -0x80000000:
return self._buffer.write(struct.pack(">Bq", 0xd3, obj))
if not default_used and self._default is not None:
obj = self._default(obj)
default_used = True
continue
raise PackValueError("Integer value out of range")
if self._use_bin_type and isinstance(obj, bytes):
n = len(obj)