segfault fixed when data is unpacked using list_hook,

drednout · drednout · commit cf89f18be761 · 2012-10-12T13:19:53.000+03:00
this bug is a twin to msgpack#28. Unit-test is also attached.
diff --git a/msgpack/unpack.h b/msgpack/unpack.h
@@ -163,6 +163,8 @@ static inline int template_callback_array_end(unpack_user* u, msgpack_unpack_obj
 {
     if (u->list_hook) {
         PyObject *new_c = PyEval_CallFunction(u->list_hook, "(O)", *c);
+        if (!new_c)
+            return -1;
         Py_DECREF(*c);
         *c = new_c;
     }
diff --git a/msgpack/unpack_template.h b/msgpack/unpack_template.h
@@ -347,7 +347,7 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
 		if(construct_cb(_array_item)(user, c->count, &c->obj, obj) < 0) { goto _failed; }
 		if(++c->count == c->size) {
 			obj = c->obj;
-			construct_cb(_array_end)(user, &obj);
+			if (construct_cb(_array_end)(user, &obj) < 0) { goto _failed; }
 			--top;
 			/*printf("stack pop %d\n", top);*/
 			goto _push;
diff --git a/test/test_obj.py b/test/test_obj.py
@@ -62,5 +62,13 @@ def test_an_exception_in_objecthook1():
     packed = packb({1: {'__complex__': True, 'real': 1, 'imag': 2}})
     unpackb(packed, object_hook=bad_complex_decoder)
 
+
+@raises(DecodeError)
+def test_an_exception_in_objecthook2():
+    packed = packb({1: [{'__complex__': True, 'real': 1, 'imag': 2}]})
+    unpackb(packed, list_hook=bad_complex_decoder, use_list=1)
+
+
+
 if __name__ == '__main__':
     main()

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,8 @@ static inline int template_callback_array_end(unpack_user* u, msgpack_unpack_obj`
`163`	`163`	`{`
`164`	`164`	`if (u->list_hook) {`
`165`	`165`	`PyObject new_c = PyEval_CallFunction(u->list_hook, "(O)", c);`
	`166`	`+ if (!new_c)`
	`167`	`+ return -1;`
`166`	`168`	`Py_DECREF(*c);`
`167`	`169`	`*c = new_c;`
`168`	`170`	`}`