From: Michael Forney <mforney@mforney.org>
Date: Thu, 20 Oct 2016 01:22:56 +0000 (-0700)
Subject: pcm_plug: Clear plugins on all error conditions
X-Git-Tag: v1.1.3~50
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=ced8722f7d98c946d1429e46252ccc061272d0db;p=alsa-lib.git

pcm_plug: Clear plugins on all error conditions

Otherwise, they will linger after the error is returned (but pcm->setup == 0).
Then, if the caller tries to clean up and call snd_pcm_close(), the assertion
plug->gen.slave == plug->req_slave will fail.

Signed-off-by: Michael Forney <mforney@mforney.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c
index 5639b9ea..266707b4 100644
--- a/src/pcm/pcm_plug.c
+++ b/src/pcm/pcm_plug.c
@@ -652,8 +652,10 @@ static int snd_pcm_plug_insert_plugins(snd_pcm_t *pcm,
 	       (plug->ttable && !plug->ttable_ok)) {
 		snd_pcm_t *new;
 		int err;
-		if (k >= sizeof(funcs)/sizeof(*funcs))
+		if (k >= sizeof(funcs)/sizeof(*funcs)) {
+			snd_pcm_plug_clear(pcm);
 			return -EINVAL;
+		}
 		err = funcs[k](pcm, &new, client, &p);
 		if (err < 0) {
 			snd_pcm_plug_clear(pcm);