openstack/deb-msgpack-python
Code Issues Proposed changes

Merge pull request #7 from steeve/patch-3

Browse Source 
Fix massive memory leak with object_hook and list_hook when unpacking.
This commit is contained in:
methane
2012-02-28 08:19:29 -08:00
parent 3a472b1624 a5bc6b7385
commit 02f01f60fc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
msgpack/unpack.h
View File

@@ -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);
PyObject *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);
PyObject *new_c = PyEval_CallObject(u->object_hook, arglist);
Py_DECREF(arglist);
Py_DECREF(*c);
*c = new_c;
}
return 0;
}