From 7c1f36dbcbe8d60c6f90cbcf7e2e801cacbcd535 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 23 Sep 2014 09:11:27 +0200 Subject: [PATCH] mixer: Fix missing hctl handle free in snd_mixer_attach_hctl() Yet another missing piece. Also, update the function document to warn about the behavior at error. Signed-off-by: Takashi Iwai --- src/mixer/mixer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c index eee9875b..3a79c8e9 100644 --- a/src/mixer/mixer.c +++ b/src/mixer/mixer.c @@ -214,6 +214,8 @@ int snd_mixer_attach(snd_mixer_t *mixer, const char *name) * \param mixer Mixer handle * \param hctl the HCTL to be attached * \return 0 on success otherwise a negative error code + * + * Upon error, this function closes the given hctl handle automatically. */ int snd_mixer_attach_hctl(snd_mixer_t *mixer, snd_hctl_t *hctl) { @@ -222,8 +224,10 @@ int snd_mixer_attach_hctl(snd_mixer_t *mixer, snd_hctl_t *hctl) assert(hctl); slave = calloc(1, sizeof(*slave)); - if (slave == NULL) + if (slave == NULL) { + snd_hctl_close(hctl); return -ENOMEM; + } err = snd_hctl_nonblock(hctl, 1); if (err < 0) { snd_hctl_close(hctl); -- 2.47.3