Fix massive memory leak with object_hook and list_hook when unpacking.

steeve · steeve · commit 31b7fda17b46 · 2012-02-28T15:36:58.000+01:00
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,10 @@ static inline int template_callback_array_end(unpack_user* u, msgpack_unpack_obj`
`161`	`161`	`{`
`162`	`162`	`if (u->list_hook) {`
`163`	`163`	`PyObject arglist = Py_BuildValue("(O)", c);`
`164`		`- *c = PyEval_CallObject(u->list_hook, arglist);`
	`164`	`+ msgpack_unpack_object *new_c = PyEval_CallObject(u->list_hook, arglist);`
`165`	`165`	`Py_DECREF(arglist);`
	`166`	`+ Py_DECREF(*c);`
	`167`	`+ *c = new_c;`
`166`	`168`	`}`
`167`	`169`	`return 0;`
`168`	`170`	`}`
`@@ -190,8 +192,10 @@ static inline int template_callback_map_end(unpack_user* u, msgpack_unpack_objec`
`190`	`192`	`{`
`191`	`193`	`if (u->object_hook) {`
`192`	`194`	`PyObject arglist = Py_BuildValue("(O)", c);`
`193`		`- *c = PyEval_CallObject(u->object_hook, arglist);`
	`195`	`+ msgpack_unpack_object *new_c = PyEval_CallObject(u->object_hook, arglist);`
`194`	`196`	`Py_DECREF(arglist);`
	`197`	`+ Py_DECREF(*c);`
	`198`	`+ *c = new_c;`
`195`	`199`	`}`
`196`	`200`	`return 0;`
`197`	`201`	`}`