output/control: add missing nullptr checks

Fixes crash when pausing the default partition after an output was moved to another partition. Closes https://github.com/MusicPlayerDaemon/MPD/issues/1147

output/control: add missing nullptr checks
b885f358 · Max Kellermann · 650a30d7 · b885f358 · b885f358
Commit b885f358 authored Apr 26, 2021 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

NEWS NEWS +1 -0

Control.cxx src/output/Control.cxx +2 -2

No files found.
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ ver 0.22.7 (not yet released)
 * database
  - simple: fix database corruption bug
 * output
+  - fix crash when pausing with multiple partitions
  - httpd: send header "Access-Control-Allow-Origin: *"
  - wasapi: add algorithm for finding usable audio format
  - wasapi: use default device only if none was configured

--- a/src/output/Control.cxx
+++ b/src/output/Control.cxx
@@ -118,7 +118,7 @@ AudioOutputControl::GetLogName() const noexcept
 {
 	assert(!IsDummy());

-	return output->GetLogName();
+	return output ? output->GetLogName() : name.c_str();
 }

 Mixer *
@@ -364,7 +364,7 @@ AudioOutputControl::LockPlay() noexcept
 void
 AudioOutputControl::LockPauseAsync() noexcept
 {
-	if (output->mixer != nullptr && !output->SupportsPause())
+	if (output && output->mixer != nullptr && !output->SupportsPause())
 		/* the device has no pause mode: close the mixer,
 		   unless its "global" flag is set (checked by
 		   mixer_auto_close()) */