summaryrefslogtreecommitdiff
path: root/gi/pygi-struct-marshal.c
diff options
context:
space:
mode:
authorChristoph Reiter <creiter@src.gnome.org>2017-03-27 06:41:19 +0200
committerChristoph Reiter <creiter@src.gnome.org>2017-04-01 11:04:26 +0200
commit4ad6899bdca6fbd0fb7e88cd16b49367f7f41267 (patch)
treeb75f447cd91af5a37dccc17d264e8c85499a4adf /gi/pygi-struct-marshal.c
parent052cea9e2b6e599e52435df3155d8de22500e0f4 (diff)
downloadpygobject-4ad6899bdca6fbd0fb7e88cd16b49367f7f41267.tar.gz
GValue: add overflow checking for py -> gint; forward marshaling exceptions
https://bugzilla.gnome.org/show_bug.cgi?id=769789
Diffstat (limited to 'gi/pygi-struct-marshal.c')
-rw-r--r--gi/pygi-struct-marshal.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gi/pygi-struct-marshal.c b/gi/pygi-struct-marshal.c
index a4276a47..60d2585a 100644
--- a/gi/pygi-struct-marshal.c
+++ b/gi/pygi-struct-marshal.c
@@ -125,9 +125,8 @@ pygi_arg_gvalue_from_py_marshal (PyObject *py_arg,
} else {
value = g_slice_new0 (GValue);
g_value_init (value, object_type);
- if (pyg_value_from_pyobject (value, py_arg) < 0) {
+ if (pyg_value_from_pyobject_with_error (value, py_arg) < 0) {
g_slice_free (GValue, value);
- PyErr_SetString (PyExc_RuntimeError, "PyObject conversion to GValue failed");
return FALSE;
}
}