From: Bert Vermeulen <redacted>
Date: Wed, 16 Oct 2013 09:10:27 +0000 (+0200)
Subject: Properly return error on exception in srd_inst_option_set()
X-Git-Tag: libsigrokdecode-0.3.0~264
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=7fc7bde666b3c1234e3d9612caa0388381881059;ds=sidebyside

Properly return error on exception in srd_inst_option_set()
---

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;
 }