X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoder.c;h=01dcf0a823b6da56a798d646750e355bfdd3de52;hp=de9b33b36ec293a48b368fbdab2bb249eb51d761;hb=3af0e3455d4263f79920afaf6aed44286ad37ba0;hpb=e592ac8917d17665119b3647b5eae27fa387d6de diff --git a/decoder.c b/decoder.c index de9b33b..01dcf0a 100644 --- a/decoder.c +++ b/decoder.c @@ -42,6 +42,8 @@ /* The list of protocol decoders. */ SRD_PRIV GSList *pd_list = NULL; +extern GSList *sessions; + /* module_sigrokdecode.c */ extern SRD_PRIV PyObject *mod_sigrokdecode; @@ -218,6 +220,7 @@ static int get_options(struct srd_decoder *d) g_variant_ref_sink(o->def); d->options = g_slist_append(d->options, o); g_free(key); + key = NULL; } Py_DecRef(py_keys); Py_DecRef(py_values); @@ -249,6 +252,9 @@ SRD_API int srd_decoder_load(const char *module_name) struct srd_probe *p; GSList *l; + if (!module_name) + return SRD_ERR_ARG; + srd_dbg("Loading protocol decoder '%s'.", module_name); py_basedec = py_method = py_attr = NULL; @@ -460,6 +466,7 @@ static void free_probes(GSList *probelist) SRD_API int srd_decoder_unload(struct srd_decoder *dec) { struct srd_decoder_option *o; + struct srd_session *sess; GSList *l; srd_dbg("Unloading protocol decoder '%s'.", dec->name); @@ -470,7 +477,10 @@ SRD_API int srd_decoder_unload(struct srd_decoder *dec) * stack. A frontend reloading a decoder thus has to restart all * instances, and rebuild the stack. */ - srd_inst_free_all(NULL); + for (l = sessions; l; l = l->next) { + sess = l->data; + srd_inst_free_all(sess, NULL); + } for (l = dec->options; l; l = l->next) { o = l->data;