From 31b7fda17b464176c34908da366bed5e4545823d Mon Sep 17 00:00:00 2001 From: Steeve Morin Date: Tue, 28 Feb 2012 15:36:58 +0100 Subject: [PATCH 1/2] Fix massive memory leak with object_hook and list_hook when unpacking. --- msgpack/unpack.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/msgpack/unpack.h b/msgpack/unpack.h index 0586ca8..6b443f2 100644 --- a/msgpack/unpack.h +++ b/msgpack/unpack.h @@ -161,8 +161,10 @@ static inline int template_callback_array_end(unpack_user* u, msgpack_unpack_obj { if (u->list_hook) { PyObject *arglist = Py_BuildValue("(O)", *c); - *c = PyEval_CallObject(u->list_hook, arglist); + msgpack_unpack_object *new_c = PyEval_CallObject(u->list_hook, arglist); Py_DECREF(arglist); + Py_DECREF(*c); + *c = new_c; } return 0; } @@ -190,8 +192,10 @@ static inline int template_callback_map_end(unpack_user* u, msgpack_unpack_objec { if (u->object_hook) { PyObject *arglist = Py_BuildValue("(O)", *c); - *c = PyEval_CallObject(u->object_hook, arglist); + msgpack_unpack_object *new_c = PyEval_CallObject(u->object_hook, arglist); Py_DECREF(arglist); + Py_DECREF(*c); + *c = new_c; } return 0; } From a5bc6b73856ca9c59f140427a26a6ffd5103b86f Mon Sep 17 00:00:00 2001 From: Steeve Morin Date: Tue, 28 Feb 2012 15:41:44 +0100 Subject: [PATCH 2/2] Better prototypes. --- msgpack/unpack.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msgpack/unpack.h b/msgpack/unpack.h index 6b443f2..2659a97 100644 --- a/msgpack/unpack.h +++ b/msgpack/unpack.h @@ -161,7 +161,7 @@ static inline int template_callback_array_end(unpack_user* u, msgpack_unpack_obj { if (u->list_hook) { PyObject *arglist = Py_BuildValue("(O)", *c); - msgpack_unpack_object *new_c = PyEval_CallObject(u->list_hook, arglist); + PyObject *new_c = PyEval_CallObject(u->list_hook, arglist); Py_DECREF(arglist); Py_DECREF(*c); *c = new_c; @@ -192,7 +192,7 @@ static inline int template_callback_map_end(unpack_user* u, msgpack_unpack_objec { if (u->object_hook) { PyObject *arglist = Py_BuildValue("(O)", *c); - msgpack_unpack_object *new_c = PyEval_CallObject(u->object_hook, arglist); + PyObject *new_c = PyEval_CallObject(u->object_hook, arglist); Py_DECREF(arglist); Py_DECREF(*c); *c = new_c;