From: Uwe Hermann <redacted>
Date: Tue, 6 Aug 2013 19:45:27 +0000 (+0200)
Subject: alsa: Fix double-free issue.
X-Git-Tag: libsigrok-0.2.1~11
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e11a1ebaccd6232227cdbec24e2b2654940f1138;p=libsigrok.git

alsa: Fix double-free issue.

This fixes bug #129.
---

diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c
index dd5588dd..9bb2ce25 100644
--- a/hardware/alsa/api.c
+++ b/hardware/alsa/api.c
@@ -43,7 +43,10 @@ static void clear_helper(void *priv)
 	devc = priv;
 
 	snd_pcm_hw_params_free(devc->hw_params);
+	devc->hw_params = NULL;
+
 	g_free((void *)devc->samplerates);
+	devc->samplerates = NULL;
 }
 
 static int dev_clear(void)
@@ -108,12 +111,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 	if (devc->capture_handle) {
 		sr_dbg("Closing PCM device.");
-		if ((ret = snd_pcm_close(devc->capture_handle)) < 0) {
+		if ((ret = snd_pcm_close(devc->capture_handle)) < 0)
 			sr_err("Failed to close device: %s.",
 			       snd_strerror(ret));
-			devc->capture_handle = NULL;
-            sdi->status = SR_ST_INACTIVE;
-		}
+		devc->capture_handle = NULL;
+		sdi->status = SR_ST_INACTIVE;
 	} else {
 		sr_dbg("No capture handle, no need to close audio device.");
 	}