Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2026-02-06 17:59:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix unpacker doesn't raise exception for invalid input (Merge branch '0.2'

Browse source 
Fixes #40

Conflicts:
	ChangeLog.rst
	msgpack/_unpacker.pyx
	msgpack/_version.py
This commit is contained in:
INADA Naoki 2012-12-29 01:43:16 +09:00
commit d57e369258
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
msgpack/_unpacker.pyx
View file

@ -38,7 +38,7 @@ cdef extern from "unpack.h":
PyObject* key
ctypedef int (*execute_fn)(template_context* ctx, const_char_ptr data,
size_t len, size_t* off) except -1
size_t len, size_t* off) except? -1
execute_fn template_construct
execute_fn template_skip
execute_fn read_array_header
@ -113,6 +113,8 @@ def unpackb(object packed, object object_hook=None, object list_hook=None,
if off < buf_len:
raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
return obj
elif ret < 0:
raise ValueError("Unpack failed: error = %d" % (ret,))
else:
raise UnpackValueError