X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=srd.c;h=22f47fcf26a869ad8856e90b6f7f34bc76be5741;hp=535ea122e5b3876d0846e170d5af63a2f6ca746c;hb=fe9160d567fbb4c890ac7b8bc2e1f2f9143f0935;hpb=3a063627c5658a65790ff52a9c0ed9a1f660a0fb diff --git a/srd.c b/srd.c index 535ea12..22f47fc 100644 --- a/srd.c +++ b/srd.c @@ -172,6 +172,7 @@ static int print_searchpaths(void) py_path = PyList_GetItem(py_paths, i); py_bytes = PyUnicode_AsUTF8String(py_path); g_string_append_printf(s, " - %s\n", PyBytes_AsString(py_bytes)); + Py_DECREF(py_bytes); } s->str[s->len - 1] = '\0'; srd_dbg("%s", s->str); @@ -289,6 +290,12 @@ SRD_API int srd_init(const char *path) return SRD_OK; } +static void srd_session_destroy_cb(void *arg, void *ignored) +{ + (void)ignored; // Prevent unused warning + srd_session_destroy((struct srd_session *)arg); +} + /** * Shutdown libsigrokdecode. * @@ -307,8 +314,9 @@ SRD_API int srd_exit(void) { srd_dbg("Exiting libsigrokdecode."); - for (GSList *l = sessions; l; l = l->next) - srd_session_destroy(l->data); + g_slist_foreach(sessions, srd_session_destroy_cb, NULL); + g_slist_free(sessions); + sessions = NULL; srd_decoder_unload_all(); g_slist_free_full(searchpaths, g_free);