srd: clear objects after final decref, so it doesn't happen twice
authorBert Vermeulen <bert@biot.com>
Mon, 30 Jan 2012 00:22:27 +0000 (01:22 +0100)
committerBert Vermeulen <bert@biot.com>
Mon, 30 Jan 2012 00:22:27 +0000 (01:22 +0100)
decoder.c

index 593f2594811468a0d5dba99772466d100fcba8f3..7480656e41a80628427467e14eab26e8da9e0dc5 100644 (file)
--- a/decoder.c
+++ b/decoder.c
@@ -173,7 +173,7 @@ int srd_load_decoder(const char *name, struct srd_decoder **dec)
                                "a subclass of sigrokdecode.Decoder.", name);
                goto err_out;
        }
                                "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")) {
 
        /* 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;
        }
                                "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")) {
 
        /* 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;
        }
                                "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")) {
 
        /* 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);
                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);
                        goto err_out;
                }
                Py_DecRef(py_attr);