control: tags -1 -moreinfo control: tags -1 -unreproducible control: tags -1 +patch
Hi, On Mon, 7 Jun 2021 22:37:11 +0300 Igor Kovalenko <igor.v.kovale...@gmail.com> wrote: > I confirm this is a regression in pulseaudio-14.0, fixed in pulseaudio > master now. > > https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/576 Thank you, let's patch for debian package, then. I've attached patches not MR, since some commits were already done in master branch. -- Regards, Hideki Yamane henrich @ debian.org/iijmio-mail.jp
>From 7b3a5ada2664e16a44edec2f0abe65f5a12f4fc1 Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Mon, 21 Jun 2021 02:32:42 +0900 Subject: [PATCH 2/2] note to changelog --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index dffa6bc8..5ede7839 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +pulseaudio (14.2-2.1) unstable; urgency=medium + + * NMU. + * debian/patches + - Add: 0003-Bug-989103-alsa-mixer-check-if-mapping-is-NULL-befor.patch + (Closes: #989103) + + -- Hideki Yamane <henr...@debian.org> Mon, 21 Jun 2021 02:31:10 +0900 + pulseaudio (14.2-2) unstable; urgency=medium * Stop installing the console kit module. -- 2.32.0
>From fef59ed6742bdec063267122fdb360826adaed18 Mon Sep 17 00:00:00 2001 From: Hideki Yamane <henr...@debian.org> Date: Mon, 21 Jun 2021 02:27:34 +0900 Subject: [PATCH 1/2] Add 0003-Bug-989103-alsa-mixer-check-if-mapping-is-NULL-befor.patch --- ...mixer-check-if-mapping-is-NULL-befor.patch | 39 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 debian/patches/0003-Bug-989103-alsa-mixer-check-if-mapping-is-NULL-befor.patch diff --git a/debian/patches/0003-Bug-989103-alsa-mixer-check-if-mapping-is-NULL-befor.patch b/debian/patches/0003-Bug-989103-alsa-mixer-check-if-mapping-is-NULL-befor.patch new file mode 100644 index 00000000..c9f84b66 --- /dev/null +++ b/debian/patches/0003-Bug-989103-alsa-mixer-check-if-mapping-is-NULL-befor.patch @@ -0,0 +1,39 @@ +From: Hideki Yamane <henr...@debian.org> +Date: Mon, 21 Jun 2021 02:25:34 +0900 +Subject: Bug#989103 alsa-mixer: check if mapping is NULL before using it + +Taken from upstream git, see +https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/79cb1369fc4d22966cb65253e9da2ccda2f25b45?merge_request_iid=576 +--- + src/modules/alsa/alsa-sink.c | 3 ++- + src/modules/alsa/alsa-source.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c +index f7fef8a..84cdb15 100644 +--- a/src/modules/alsa/alsa-sink.c ++++ b/src/modules/alsa/alsa-sink.c +@@ -2107,7 +2107,8 @@ 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); + +- mdev = pa_proplist_gets(mapping->proplist, "alsa.mixer_device"); ++ if (mapping) ++ mdev = pa_proplist_gets(mapping->proplist, "alsa.mixer_device"); + 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 76370f8..083f928 100644 +--- a/src/modules/alsa/alsa-source.c ++++ b/src/modules/alsa/alsa-source.c +@@ -1813,7 +1813,8 @@ 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); + +- mdev = pa_proplist_gets(mapping->proplist, "alsa.mixer_device"); ++ if (mapping) ++ mdev = pa_proplist_gets(mapping->proplist, "alsa.mixer_device"); + if (mdev) { + u->mixer_handle = pa_alsa_open_mixer_by_name(u->mixers, mdev, false); + } else { diff --git a/debian/patches/series b/debian/patches/series index 54c06fdd..fe50543a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ disable-autospawn.patch tests-fix-use-of-uninitialized-variable-cpu_info.patch +0003-Bug-989103-alsa-mixer-check-if-mapping-is-NULL-befor.patch -- 2.32.0
