X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoder.c;h=efb1f9ae4bdd8b2ac827a2aec123455178cf53aa;hp=f242ffedc770174a2a534576f3fd0436ab8a0d51;hb=6fff00eee1dd62477cd2708df480b985ef416a67;hpb=2086c68463fef416fd9a48dac5e1aa7fa593308d

diff --git a/decoder.c b/decoder.c
index f242ffe..efb1f9a 100644
--- a/decoder.c
+++ b/decoder.c
@@ -137,12 +137,12 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 	int alen, ret, i;
 	char **ann;
 
-	srd_dbg("srd: loading module '%s'", name);
+	srd_dbg("Loading module '%s'.", name);
 
 	py_basedec = py_method = py_attr = NULL;
 
 	if (!(d = g_try_malloc0(sizeof(struct srd_decoder)))) {
-		srd_dbg("srd: Failed to malloc struct srd_decoder");
+		srd_dbg("Failed to malloc struct srd_decoder.");
 		ret = SRD_ERR_MALLOC;
 		goto err_out;
 	}
@@ -164,7 +164,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 	}
 
 	if (!(py_basedec = PyObject_GetAttrString(mod_sigrokdecode, "Decoder"))) {
-		srd_dbg("srd: sigrokdecode module not loaded");
+		srd_dbg("sigrokdecode module not loaded.");
 		goto err_out;
 	}
 
@@ -173,7 +173,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 				"a subclass of sigrokdecode.Decoder.", name);
 		goto err_out;
 	}
-	Py_DecRef(py_basedec);
+	Py_CLEAR(py_basedec);
 
 	/* Check for a proper start() method. */
 	if (!PyObject_HasAttrString(d->py_dec, "start")) {
@@ -187,7 +187,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 				"is not a method.", name);
 		goto err_out;
 	}
-	Py_DecRef(py_method);
+	Py_CLEAR(py_method);
 
 	/* Check for a proper decode() method. */
 	if (!PyObject_HasAttrString(d->py_dec, "decode")) {
@@ -201,7 +201,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 				"is not a method.", name);
 		goto err_out;
 	}
-	Py_DecRef(py_method);
+	Py_CLEAR(py_method);
 
 	/* If present, options must be a dictionary. */
 	if (PyObject_HasAttrString(d->py_dec, "options")) {
@@ -209,6 +209,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
 		if (!PyDict_Check(py_attr)) {
 			srd_err("Protocol decoder %s options attribute is not "
 					"a dictionary.", d->name);
+			Py_DecRef(py_attr);
 			goto err_out;
 		}
 		Py_DecRef(py_attr);
@@ -350,9 +351,6 @@ int srd_load_all_decoders(void)
 		/* The decoder name is the PD directory name (e.g. "i2c"). */
 		decodername = g_strdup(direntry);
 
-		if (!(dec = g_try_malloc(sizeof(struct srd_decoder))))
-			return SRD_ERR_MALLOC;
-
 		if ((ret = srd_load_decoder(decodername, &dec)) == SRD_OK) {
 			/* Append it to the list of supported/loaded decoders. */
 			pd_list = g_slist_append(pd_list, dec);