From: Uwe Hermann <redacted>
Date: Wed, 23 Oct 2013 17:23:40 +0000 (+0200)
Subject: controller.c: Add checks for srd_inst_option_set().
X-Git-Tag: libsigrokdecode-0.3.0~250
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=3af0e3455d4263f79920afaf6aed44286ad37ba0;p=libsigrokdecode.git

controller.c: Add checks for srd_inst_option_set().

This also fixes some unit tests that were previously failing.
---

diff --git a/controller.c b/controller.c
index 635e47e..ebb9f3a 100644
--- a/controller.c
+++ b/controller.c
@@ -305,6 +305,16 @@ SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
 	const char *val_str;
 	char *dbg, *key;
 
+	if (!di) {
+		srd_err("Invalid decoder instance.");
+		return SRD_ERR_ARG;
+	}
+
+	if (!options) {
+		srd_err("Invalid options GHashTable.");
+		return SRD_ERR_ARG;
+	}
+
 	if (!PyObject_HasAttrString(di->decoder->py_dec, "options")) {
 		/* Decoder has no options. */
 		if (g_hash_table_size(options) == 0) {