Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (45bb901da393415c65ee5438bd5a14a0605cf172)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (45bb901da393415c65ee5438bd5a14a0605cf172)
  • Date: Wed, 6 Jul 2022 23:31:03 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

audio-players/mpd/HISTORY | 4 ++
audio-players/mpd/patches/pipewire-nullptr-check.patch | 30
+++++++++++++++++
2 files changed, 34 insertions(+)

New commits:
commit 45bb901da393415c65ee5438bd5a14a0605cf172
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

audio-players/mpd: fixed crash with pipewire >= 0.3.53

diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index a82cdf1..f0887d5 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,7 @@
+2022-07-06 Pavel Vinogradov <public AT sourcemage.org>
+ * patches/pipewire-nullptr-check.patch: added fix preventing mpd from
crashing
+ when output is pipewire >= 0.3.53
+
2022-07-05 Pavel Vinogradov <public AT sourcemage.org>
* patches/fmt-v9.patch: added for fmt v9 API

diff --git a/audio-players/mpd/patches/pipewire-nullptr-check.patch
b/audio-players/mpd/patches/pipewire-nullptr-check.patch
new file mode 100644
index 0000000..4d7bad2
--- /dev/null
+++ b/audio-players/mpd/patches/pipewire-nullptr-check.patch
@@ -0,0 +1,30 @@
+From 2ee57f9b0d8d08c554392e6b832a335593a7555d Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max.kellermann AT gmail.com>
+Date: Mon, 4 Jul 2022 19:19:31 +0200
+Subject: [PATCH] output/PipeWire: add nullptr check, fixing crash with
+ PipeWire 0.3.53
+
+Since PipeWire 0.3.53, control names can apparently be nulled, leading
+to crashes in applications assertion that the string cannot be
+nullptr.
+
+Closes https://github.com/MusicPlayerDaemon/MPD/issues/1558
+---
+ NEWS | 2 ++
+ src/output/plugins/PipeWireOutputPlugin.cxx | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/output/plugins/PipeWireOutputPlugin.cxx
b/src/output/plugins/PipeWireOutputPlugin.cxx
+index 18821b1059..c752820d01 100644
+--- a/src/output/plugins/PipeWireOutputPlugin.cxx
++++ b/src/output/plugins/PipeWireOutputPlugin.cxx
+@@ -235,7 +235,8 @@ class PipeWireOutput final : AudioOutput {
+ [[maybe_unused]] uint32_t id,
+ const struct pw_stream_control *control)
noexcept {
+ auto &o = *(PipeWireOutput *)data;
+- if (StringIsEqual(control->name, "Channel Volumes"))
++ if (control->name != nullptr &&
++ StringIsEqual(control->name, "Channel Volumes"))
+ o.ControlInfo(control);
+ }
+



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (45bb901da393415c65ee5438bd5a14a0605cf172), Pavel Vinogradov, 07/06/2022

Archive powered by MHonArc 2.6.24.

Top of Page