From 7fc7bde666b3c1234e3d9612caa0388381881059 Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Wed, 16 Oct 2013 11:10:27 +0200 Subject: Properly return error on exception in srd_inst_option_set() --- controller.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/controller.c b/controller.c index c6347c0..672ac93 100644 --- a/controller.c +++ b/controller.c @@ -412,8 +412,10 @@ err_out: Py_XDECREF(py_dec_optkeys); Py_XDECREF(py_dec_options); g_free(key); - if (PyErr_Occurred()) + if (PyErr_Occurred()) { srd_exception_catch("Stray exception in srd_inst_option_set()."); + ret = SRD_ERR_PYTHON; + } return ret; } -- cgit v1.2.3-70-g09d2