A segfault fixed in the issue msgpack#28

drednout · drednout · commit 89ce16df39f6 · 2012-10-12T12:32:32.000+03:00
diff --git a/msgpack/unpack.h b/msgpack/unpack.h
@@ -207,6 +207,9 @@ static inline int template_callback_map_end(unpack_user* u, msgpack_unpack_objec
 {
     if (u->object_hook) {
         PyObject *new_c = PyEval_CallFunction(u->object_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
@@ -361,7 +361,7 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
 		if(construct_cb(_map_item)(user, c->count, &c->obj, c->map_key, obj) < 0) { goto _failed; }
 		if(++c->count == c->size) {
 			obj = c->obj;
-			construct_cb(_map_end)(user, &obj);
+			if (construct_cb(_map_end)(user, &obj) < 0) { goto _failed; }
 			--top;
 			/*printf("stack pop %d\n", top);*/
 			goto _push;

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,9 @@ static inline int template_callback_map_end(unpack_user* u, msgpack_unpack_objec`
`207`	`207`	`{`
`208`	`208`	`if (u->object_hook) {`
`209`	`209`	`PyObject new_c = PyEval_CallFunction(u->object_hook, "(O)", c);`
	`210`	`+ if (!new_c)`
	`211`	`+ return -1;`
	`212`	`+`
`210`	`213`	`Py_DECREF(*c);`
`211`	`214`	`*c = new_c;`
`212`	`215`	`}`