From: Bert Vermeulen Date: Sat, 18 Oct 2014 21:09:47 +0000 (+0200) Subject: Free channel group private storage when clearing device instance. X-Git-Tag: libsigrok-0.4.0~838 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=b1b1944e19f8dd4837293ecd7e2d01daa429068c;p=libsigrok.git Free channel group private storage when clearing device instance. --- diff --git a/src/device.c b/src/device.c index 2b6cda03..f3a76ac2 100644 --- a/src/device.c +++ b/src/device.c @@ -247,6 +247,7 @@ SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int status, SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi) { struct sr_channel *ch; + struct sr_channel_group *cg; GSList *l; for (l = sdi->channels; l; l = l->next) { @@ -257,8 +258,11 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi) } g_slist_free(sdi->channels); - if (sdi->channel_groups) - g_slist_free(sdi->channel_groups); + for (l = sdi->channel_groups; l; l = l->next) { + cg = l->data; + g_free(cg->priv); + } + g_slist_free(sdi->channel_groups); g_free(sdi->vendor); g_free(sdi->model);