Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2025-11-10 14:31:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #155 from methane/fix/152

Browse source 
Decrease refcnt when error happend while unpacking
This commit is contained in:
INADA Naoki 2015-11-08 12:45:29 +09:00
commit dbe6572ee5
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
msgpack/_unpacker.pyx
View file

@ -47,6 +47,7 @@ cdef extern from "unpack.h":
execute_fn read_map_header execute_fn read_map_header
void unpack_init(unpack_context* ctx) void unpack_init(unpack_context* ctx)
object unpack_data(unpack_context* ctx) object unpack_data(unpack_context* ctx)
void unpack_clear(unpack_context* ctx)
cdef inline init_ctx(unpack_context *ctx, cdef inline init_ctx(unpack_context *ctx,
object object_hook, object object_pairs_hook, object object_hook, object object_pairs_hook,
@ -141,8 +142,8 @@ def unpackb(object packed, object object_hook=None, object list_hook=None,
if off < buf_len: if off < buf_len:
raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off)) raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
return obj return obj
else: unpack_clear(&ctx)
raise UnpackValueError("Unpack failed: error = %s" % (ret,)) raise UnpackValueError("Unpack failed: error = %d" % (ret,))
def unpack(object stream, object object_hook=None, object list_hook=None, def unpack(object stream, object object_hook=None, object list_hook=None,

4
msgpack/unpack_template.h
View file

@ -70,6 +70,10 @@ static inline PyObject* unpack_data(unpack_context* ctx)
return (ctx)->stack[0].obj; return (ctx)->stack[0].obj;
} }
static inline PyObject* unpack_clear(unpack_context *ctx)
{
Py_CLEAR(ctx->stack[0].obj);
}
template <bool construct> template <bool construct>
static inline int unpack_execute(unpack_context* ctx, const char* data, Py_ssize_t len, Py_ssize_t* off) static inline int unpack_execute(unpack_context* ctx, const char* data, Py_ssize_t len, Py_ssize_t* off)