From ce033b0c9d2049fbca56ea54dc0ea5b3ebf2e827 Mon Sep 17 00:00:00 2001 From: "Igor V. Kovalenko" Date: Fri, 6 Aug 2021 22:26:40 +0300 Subject: [PATCH] alsa-mixer: Set mdev to NULL if there is no mapping We check if mapping is NULL but if so we never set mdev, set it to NULL as well. Fixes: 79cb1369fc4d22966cb65253e9da2ccda2f25b45 Change-Id: I615491e5752f2ad23794b90170fee291525659ce Part-of: --- src/modules/alsa/alsa-sink.c | 3 +-- src/modules/alsa/alsa-source.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c index a20d97a..ea397f9 100644 --- a/src/modules/alsa/alsa-sink.c +++ b/src/modules/alsa/alsa-sink.c @@ -2146,8 +2146,7 @@ static void find_mixer(struct userdata *u, pa_alsa_mapping *mapping, const char u->mixers = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) pa_alsa_mixer_free); - if (mapping) - mdev = pa_proplist_gets(mapping->proplist, "alsa.mixer_device"); + mdev = mapping ? pa_proplist_gets(mapping->proplist, "alsa.mixer_device") : NULL; if (mdev) { u->mixer_handle = pa_alsa_open_mixer_by_name(u->mixers, mdev, true); } else { diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c index 59cca12..d13ff31 100644 --- a/src/modules/alsa/alsa-source.c +++ b/src/modules/alsa/alsa-source.c @@ -1821,8 +1821,7 @@ static void find_mixer(struct userdata *u, pa_alsa_mapping *mapping, const char u->mixers = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL, (pa_free_cb_t) pa_alsa_mixer_free); - if (mapping) - mdev = pa_proplist_gets(mapping->proplist, "alsa.mixer_device"); + mdev = mapping ? pa_proplist_gets(mapping->proplist, "alsa.mixer_device") : NULL; if (mdev) { u->mixer_handle = pa_alsa_open_mixer_by_name(u->mixers, mdev, false); } else { -- 2.7.4