Takashi Iwai
84789a8f60
- Backport upstream fixes / enhancements: mostly small fixes spotted by coccinelle and oethers, the fixes for proper rewind support, a new DSD format support, hwdep definitions sync, and addition of PAZ00 UCM configs. 0022-pcm-fix-snd_pcm_mmap_hw_avail-near-the-boundary.patch 0023-pcm-fix-return-value-of-snd_pcm_share_slave_avail.patch 0024-pcm-add-new-32-bit-DSD-sample-format.patch 0025-dmix-actually-rewind-when-running-or-being-drained.patch 0026-pcm-express-the-rewind-size-limitation-logic-better.patch 0027-pcm-handle-negative-values-from-snd_pcm_mmap_hw_avai.patch 0028-pcm-rate-use-the-snd_pcm_mmap_hw_avail-function.patch 0029-pcm-null-use-the-snd_pcm_mmap_avail-function.patch 0030-rate-handle-negative-values-from-snd_pcm_mmap_playba.patch 0031-dsnoop-rewindable-and-forwardable-logic-was-swapped.patch 0033-pcm-file-don-t-recurse-in-the-rewindable-and-forward.patch 0034-pcm-route-Fix-the-bad-condition-always-false.patch 0035-pcm-rate-hw_avail-must-not-be-negative-before-starti.patch 0036-hwdep-add-missing-declaration-for-snd_hwdep_poll_des.patch 0037-mixer-fixed-double-free.patch 0038-pcm_file-fixed-missing-free.patch 0039-sbase-fixed-missing-free.patch 0040-rawmidi-close-handle-h.patch 0041-pcm_share-fixing-missing-mutex-unlock.patch 0042-simple_abst-null-check-for-lib.patch 0043-socket-missing-socket-close.patch 0044-pcm_hooks-null-check-for-h.patch 0045-conf-return-negative-value-in-case-of-error.patch 0046-control-return-negative-value-in-case-of-error.patch 0047-pcm-return-negative-value-in-case-of-error.patch 0048-mixer-Fix-missing-hctl-handle-free-in-snd_mixer_atta.patch OBS-URL: https://build.opensuse.org/request/show/257835 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=170
45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
From 7c1f36dbcbe8d60c6f90cbcf7e2e801cacbcd535 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
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 <tiwai@suse.de>
|
|
---
|
|
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 eee9875b44fb..3a79c8e91efb 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.1.2
|
|
|