mixer_control: don't lock the mutex twice in mixer_failed()

The function mixer_failed() expects the mixer mutex to be already locked, yet it calls mixer_close(), which attempts to lock the mutex again, deadlocking itself.

mixer_control: don't lock the mutex twice in mixer_failed()
1a411b1c · Max Kellermann · e7519829 · 1a411b1c
Commit 1a411b1c authored Mar 27, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 5 deletions

mixer_control.c src/mixer_control.c +14 -5

No files found.
--- a/src/mixer_control.c
+++ b/src/mixer_control.c
@@ -89,6 +89,17 @@ mixer_open(struct mixer *mixer)
 	return success;
 }

+static void
+mixer_close_internal(struct mixer *mixer)
+{
+	assert(mixer != NULL);
+	assert(mixer->plugin != NULL);
+	assert(mixer->open);
+
+	mixer->plugin->close(mixer);
+	mixer->open = false;
+}
+
 void
 mixer_close(struct mixer *mixer)
 {
@@ -97,10 +108,8 @@ mixer_close(struct mixer *mixer)

 	g_mutex_lock(mixer->mutex);

-	if (mixer->open) {
-		mixer->plugin->close(mixer);
-		mixer->open = false;
-	}
+	if (mixer->open)
+		mixer_close_internal(mixer);

 	g_mutex_unlock(mixer->mutex);
 }
@@ -121,7 +130,7 @@ mixer_failed(struct mixer *mixer)
 {
 	assert(mixer->open);

-	mixer_close(mixer);
+	mixer_close_internal(mixer);

 	mixer->failed = true;
 }