output/PipeWire: add nullptr check to SetVolume()

If the PipeWire output has not yet been enabled and no thread_loop has been created yet, a nullptr dereference in SetVolume() was possible because nullptr was passed to pw_thread_loop_lock().

output/PipeWire: add nullptr check to SetVolume()
4d6ae6ff · Max Kellermann · ecee6f41 · 4d6ae6ff · 4d6ae6ff
Commit 4d6ae6ff authored Jul 08, 2022 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

NEWS NEWS +1 -0

PipeWireOutputPlugin.cxx src/output/plugins/PipeWireOutputPlugin.cxx +8 -0

No files found.
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ ver 0.23.8 (not yet released)
 * mixer
  - better error messages
  - alsa: fix setting volume before playback starts
+  - pipewire: fix crash bug
 * support libfmt 9

 ver 0.23.7 (2022/05/09)

--- a/src/output/plugins/PipeWireOutputPlugin.cxx
+++ b/src/output/plugins/PipeWireOutputPlugin.cxx
@@ -312,6 +312,14 @@ PipeWireOutput::PipeWireOutput(const ConfigBlock &block)
 void
 PipeWireOutput::SetVolume(float _volume)
 {
+	if (thread_loop == nullptr) {
+		/* the mixer is open (because it is a "global" mixer),
+		   but Enable() on this output has not yet been
+		   called */
+		volume = _volume;
+		return;
+	}
+
 	const PipeWire::ThreadLoopLock lock(thread_loop);

 	float newvol = _volume*_volume*_volume;