output/osx: catch kAudioDevicePropertyHogMode errors

Our AudioObjectGetPropertyDataT() wrapper throws exception on error, and calling it from OSXOutput::Disable() can cause MPD crash due to std::terminate(). Closes https://github.com/MusicPlayerDaemon/MPD/issues/932

output/osx: catch kAudioDevicePropertyHogMode errors
4f6c54ec · Max Kellermann · 2bdf1b22 · 4f6c54ec · 4f6c54ec
Commit 4f6c54ec authored Aug 14, 2020 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 3 deletions

NEWS NEWS +1 -0

OSXOutputPlugin.cxx src/output/plugins/OSXOutputPlugin.cxx +11 -3

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.21.26 (not yet released)
 * output
+  - osx: fix crash bug
  - sles: support floating point samples

 ver 0.21.25 (2020/07/06)

--- a/src/output/plugins/OSXOutputPlugin.cxx
+++ b/src/output/plugins/OSXOutputPlugin.cxx
@@ -477,7 +477,7 @@ osx_output_set_buffer_size(AudioUnit au, AudioStreamBasicDescription desc)
 }

 static void
-osx_output_hog_device(AudioDeviceID dev_id, bool hog)
+osx_output_hog_device(AudioDeviceID dev_id, bool hog) noexcept
 {
 	static constexpr AudioObjectPropertyAddress aopa = {
 		kAudioDevicePropertyHogMode,
@@ -485,8 +485,16 @@ osx_output_hog_device(AudioDeviceID dev_id, bool hog)
 		kAudioObjectPropertyElementMaster
 	};

-	pid_t hog_pid = AudioObjectGetPropertyDataT<pid_t>(dev_id,
-							   aopa);
+	pid_t hog_pid;
+
+	try {
+		hog_pid = AudioObjectGetPropertyDataT<pid_t>(dev_id, aopa);
+	} catch (...) {
+		Log(LogLevel::DEBUG, std::current_exception(),
+		    "Failed to query HogMode");
+		return;
+	}
+
 	if (hog) {
 		if (hog_pid != -1) {
 			FormatDebug(osx_output_domain,