X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=type_decoder.c;h=9e0a27cf7738622aada2813e5ddfaa1457870d3d;hb=3389df7d5d85edc9453c3bd7f3556154152af501;hp=880dbade0a7697d054308001b1e3a66b988d829c;hpb=fb0b05e68352a55e1d8a212413df40d90a30202c;p=libsigrokdecode.git

diff --git a/type_decoder.c b/type_decoder.c
index 880dbad..9e0a27c 100644
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -40,6 +40,15 @@ static const char *output_type_name(unsigned int idx)
 	return names[MIN(idx, G_N_ELEMENTS(names) - 1)];
 }
 
+static void release_annotation(struct srd_proto_data_annotation *pda)
+{
+	if (!pda)
+		return;
+	if (pda->ann_text)
+		g_strfreev(pda->ann_text);
+	g_free(pda);
+}
+
 static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj,
 		struct srd_proto_data *pdata)
 {
@@ -112,6 +121,14 @@ err:
 	return SRD_ERR_PYTHON;
 }
 
+static void release_binary(struct srd_proto_data_binary *pdb)
+{
+	if (!pdb)
+		return;
+	g_free((void *)pdb->data);
+	g_free(pdb);
+}
+
 static int convert_binary(struct srd_decoder_inst *di, PyObject *obj,
 		struct srd_proto_data *pdata)
 {
@@ -168,16 +185,18 @@ static int convert_binary(struct srd_decoder_inst *di, PyObject *obj,
 		goto err;
 	}
 
-	pdb = g_malloc(sizeof(struct srd_proto_data_binary));
 	if (PyBytes_AsStringAndSize(py_tmp, &buf, &size) == -1)
 		goto err;
 
 	PyGILState_Release(gstate);
 
+	pdb = g_malloc(sizeof(struct srd_proto_data_binary));
 	pdb->bin_class = bin_class;
 	pdb->size = size;
-	if (!(pdb->data = g_try_malloc(pdb->size)))
+	if (!(pdb->data = g_try_malloc(pdb->size))) {
+		g_free(pdb);
 		return SRD_ERR_MALLOC;
+	}
 	memcpy((void *)pdb->data, (const void *)buf, pdb->size);
 	pdata->data = pdb;
 
@@ -229,6 +248,13 @@ err:
 	return SRD_ERR_PYTHON;
 }
 
+static void release_meta(GVariant *gvar)
+{
+	if (!gvar)
+		return;
+	g_variant_unref(gvar);
+}
+
 static PyObject *Decoder_put(PyObject *self, PyObject *args)
 {
 	GSList *l;
@@ -241,6 +267,8 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	struct srd_pd_callback *cb;
 	PyGILState_STATE gstate;
 
+	py_data = NULL;
+
 	gstate = PyGILState_Ensure();
 
 	if (!(di = srd_inst_find_by_obj(NULL, self))) {
@@ -287,6 +315,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 			Py_BEGIN_ALLOW_THREADS
 			cb->cb(&pdata, cb->cb_data);
 			Py_END_ALLOW_THREADS
+			release_annotation(pdata.data);
 		}
 		break;
 	case SRD_OUTPUT_PYTHON:
@@ -319,6 +348,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 			Py_BEGIN_ALLOW_THREADS
 			cb->cb(&pdata, cb->cb_data);
 			Py_END_ALLOW_THREADS
+			release_binary(pdata.data);
 		}
 		break;
 	case SRD_OUTPUT_META:
@@ -331,6 +361,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 			Py_BEGIN_ALLOW_THREADS
 			cb->cb(&pdata, cb->cb_data);
 			Py_END_ALLOW_THREADS
+			release_meta(pdata.data);
 		}
 		break;
 	default:
@@ -488,14 +519,13 @@ static PyObject *get_current_pinvalues(const struct srd_decoder_inst *di)
 	PyObject *py_pinvalues;
 	PyGILState_STATE gstate;
 
-	gstate = PyGILState_Ensure();
-
 	if (!di) {
 		srd_err("Invalid decoder instance.");
-		PyGILState_Release(gstate);
 		return NULL;
 	}
 
+	gstate = PyGILState_Ensure();
+
 	py_pinvalues = PyTuple_New(di->dec_num_channels);
 
 	for (i = 0; i < di->dec_num_channels; i++) {
@@ -556,7 +586,7 @@ static int create_term_list(PyObject *py_dict, GSList **term_list)
 				srd_err("Failed to get the value.");
 				goto err;
 			}
-			term = g_malloc0(sizeof(struct srd_term));
+			term = g_malloc(sizeof(struct srd_term));
 			term->type = get_term_type(term_str);
 			term->channel = PyLong_AsLong(py_key);
 			g_free(term_str);
@@ -567,7 +597,7 @@ static int create_term_list(PyObject *py_dict, GSList **term_list)
 				srd_err("Failed to get number of samples to skip.");
 				goto err;
 			}
-			term = g_malloc0(sizeof(struct srd_term));
+			term = g_malloc(sizeof(struct srd_term));
 			term->type = SRD_TERM_SKIP;
 			term->num_samples_to_skip = num_samples_to_skip;
 			term->num_samples_already_skipped = 0;
@@ -730,7 +760,7 @@ static int set_skip_condition(struct srd_decoder_inst *di, uint64_t count)
 	GSList *term_list;
 
 	condition_list_free(di);
-	term = g_malloc0(sizeof(*term));
+	term = g_malloc(sizeof(*term));
 	term->type = SRD_TERM_SKIP;
 	term->num_samples_to_skip = count;
 	term->num_samples_already_skipped = 0;
@@ -805,7 +835,9 @@ static PyObject *Decoder_wait(PyObject *self, PyObject *args)
 		 * while the termination request still gets signalled.
 		 */
 		found_match = FALSE;
-		ret = process_samples_until_condition_match(di, &found_match);
+
+		/* Ignore return value for now, should never be negative. */
+		(void)process_samples_until_condition_match(di, &found_match);
 
 		Py_END_ALLOW_THREADS