Avoid using Py_IncRef/Py_DecRef for consistency.

[libsigrokdecode.git] / instance.c

diff --git a/instance.c b/instance.c
index 99c5012886b48750f4bcd4f23ac2ffdfbf872666..2859493194d724f7ea775cead7e6cba740742808 100644 (file)
--- a/instance.c
+++ b/instance.c
@@ -140,6 +140,7 @@ SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
        Py_DECREF(py_di_options);
        py_di_options = PyDict_New();
        PyObject_SetAttrString(di->py_inst, "options", py_di_options);
+       Py_DECREF(py_di_options);
 
        for (l = di->decoder->options; l; l = l->next) {
                sdo = l->data;
@@ -181,10 +182,13 @@ SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
                                goto err_out;
                        }
                }
-               if (PyDict_SetItemString(py_di_options, sdo->id, py_optval) == -1)
+               if (PyDict_SetItemString(py_di_options, sdo->id, py_optval) == -1) {
+                       Py_XDECREF(py_optval);
                        goto err_out;
+               }
                /* Not harmful even if we used the default. */
                g_hash_table_remove(options, sdo->id);
+               Py_XDECREF(py_optval);
        }
        if (g_hash_table_size(options) != 0)
                srd_warn("Unknown options specified for '%s'", di->inst_id);
@@ -192,7 +196,6 @@ SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
        ret = SRD_OK;
 
 err_out:
-       Py_XDECREF(py_optval);
        if (PyErr_Occurred()) {
                srd_exception_catch("Stray exception in srd_inst_option_set()");
                ret = SRD_ERR_PYTHON;
@@ -529,6 +532,27 @@ SRD_API int srd_inst_stack(struct srd_session *sess,
                sess->di_list = g_slist_remove(sess->di_list, di_top);
        }
 
+       /*
+        * Check if there's at least one matching input/output pair
+        * for the stacked PDs. We warn if that's not the case, but it's
+        * not a hard error for the time being.
+        */
+       gboolean at_least_one_match = FALSE;
+       for (GSList *out = di_bottom->decoder->outputs; out; out = out->next) {
+               const char *o = out->data;
+               for (GSList *in = di_top->decoder->inputs; in; in = in->next) {
+                       const char *i = in->data;
+                       if (!strcmp(o, i)) {
+                               at_least_one_match = TRUE;
+                               break;
+                       }
+               }
+       }
+
+       if (!at_least_one_match)
+               srd_warn("No matching in-/output when stacking %s onto %s.",
+                       di_top->inst_id, di_bottom->inst_id);
+
        /* Stack on top of source di. */
        di_bottom->next_di = g_slist_append(di_bottom->next_di, di_top);
 
@@ -654,7 +678,7 @@ SRD_API int srd_inst_initial_pins_set_all(struct srd_decoder_inst *di, GArray *i
 /** @private */
 SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
 {
-       PyObject *py_res;
+       PyObject *py_res, *py_samplenum;
        GSList *l;
        struct srd_decoder_inst *next_di;
        int ret;
@@ -671,10 +695,12 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
                PyGILState_Release(gstate);
                return SRD_ERR_PYTHON;
        }
-       Py_DecRef(py_res);
+       Py_DECREF(py_res);
 
        /* Set self.samplenum to 0. */
-       PyObject_SetAttrString(di->py_inst, "samplenum", PyLong_FromLong(0));
+       py_samplenum = PyLong_FromLong(0);
+       PyObject_SetAttrString(di->py_inst, "samplenum", py_samplenum);
+       Py_DECREF(py_samplenum);
 
        /* Set self.matched to None. */
        PyObject_SetAttrString(di->py_inst, "matched", Py_None);
@@ -774,6 +800,7 @@ SRD_PRIV void condition_list_free(struct srd_decoder_inst *di)
                        g_slist_free_full(ll, g_free);
        }
 
+       g_slist_free(di->condition_list);
        di->condition_list = NULL;
 }
 
@@ -1019,7 +1046,7 @@ static gpointer di_thread(gpointer data)
         * Call self.decode(). Only returns if the PD throws an exception.
         * "Regular" termination of the decode() method is not expected.
         */
-       Py_IncRef(di->py_inst);
+       Py_INCREF(di->py_inst);
        srd_dbg("%s: Calling decode().", di->inst_id);
        py_res = PyObject_CallMethod(di->py_inst, "decode", NULL);
        srd_dbg("%s: decode() terminated.", di->inst_id);
@@ -1075,7 +1102,7 @@ static gpointer di_thread(gpointer data)
         * decode() will re-start another thread transparently.
         */
        srd_dbg("%s: decode() terminated (req %d).", di->inst_id, wanted_term);
-       Py_DecRef(py_res);
+       Py_DECREF(py_res);
        PyErr_Clear();
 
        PyGILState_Release(gstate);
@@ -1284,7 +1311,7 @@ SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di)
        srd_inst_reset_state(di);
 
        gstate = PyGILState_Ensure();
-       Py_DecRef(di->py_inst);
+       Py_DECREF(di->py_inst);
        PyGILState_Release(gstate);
 
        g_free(di->inst_id);