generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-20 14:02:40 +02:00
Code Issues Projects Releases Wiki Activity

Add check for recursion limit and default hook result.

Browse Source
This commit is contained in:
INADA Naoki
2010-10-26 01:49:00 +09:00
parent d8e3575a46
commit 063d51c662
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
python/msgpack/_msgpack.pyx
View File

@@ -80,7 +80,7 @@ cdef class Packer(object):
def __dealloc__(self): def __dealloc__(self):
free(self.pk.buf); free(self.pk.buf);
cdef int _pack(self, object o) except -1: cdef int _pack(self, object o, int nest_limit=511, default=None) except -1:
cdef long long llval cdef long long llval
cdef unsigned long long ullval cdef unsigned long long ullval
cdef long longval cdef long longval
@@ -89,6 +89,9 @@ cdef class Packer(object):
cdef int ret cdef int ret
cdef dict d cdef dict d
if nest_limit < 0:
raise ValueError("Too deep.")
if o is None: if o is None:
ret = msgpack_pack_nil(&self.pk) ret = msgpack_pack_nil(&self.pk)
#elif PyBool_Check(o): #elif PyBool_Check(o):
@@ -126,33 +129,26 @@ cdef class Packer(object):
ret = msgpack_pack_map(&self.pk, len(d)) ret = msgpack_pack_map(&self.pk, len(d))
if ret == 0: if ret == 0:
for k,v in d.items(): for k,v in d.items():
ret = self._pack(k) ret = self._pack(k, nest_limit-1, default)
if ret != 0: break if ret != 0: break
ret = self._pack(v) ret = self._pack(v, nest_limit-1, default)
if ret != 0: break if ret != 0: break
elif PySequence_Check(o): elif PySequence_Check(o):
ret = msgpack_pack_array(&self.pk, len(o)) ret = msgpack_pack_array(&self.pk, len(o))
if ret == 0: if ret == 0:
for v in o: for v in o:
ret = self._pack(v) ret = self._pack(v, nest_limit-1, default)
if ret != 0: break if ret != 0: break
elif self.default is not None: elif default is not None:
o = self.default(o) o = self.default(o)
d = o ret = self._pack(o, nest_limit)
ret = msgpack_pack_map(&self.pk, len(d))
if ret == 0:
for k,v in d.items():
ret = self._pack(k)
if ret != 0: break
ret = self._pack(v)
if ret != 0: break
else: else:
raise TypeError("can't serialize %r" % (o,)) raise TypeError("can't serialize %r" % (o,))
return ret return ret
def pack(self, object obj): def pack(self, object obj):
cdef int ret cdef int ret
ret = self._pack(obj) ret = self._pack(obj, self.default)
if ret: if ret:
raise TypeError raise TypeError
buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length) buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)

8
python/test/test_obj.py
View File

@@ -26,6 +26,12 @@ def test_decode_hook():
unpacked = unpacks(packed, object_hook=_decode_complex) unpacked = unpacks(packed, object_hook=_decode_complex)
eq_(unpacked[1], 1+2j) eq_(unpacked[1], 1+2j)
@raises(TypeError)
def test_bad_hook():
packed = packs([3, 1+2j], default=lambda o: o)
unpacked = unpacks(packed)
if __name__ == '__main__': if __name__ == '__main__':
#main()
test_decode_hook() test_decode_hook()
test_encode_hook()
test_bad_hook()