input/soup: unlock before cancelling the soup message

Avoid recursive deadlock in _session_callback().

input/soup: unlock before cancelling the soup message
0ef15e5f · Max Kellermann · 9ea8a840 · 0ef15e5f
Commit 0ef15e5f authored Sep 15, 2011 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

soup_input_plugin.c src/input/soup_input_plugin.c +5 -3

No files found.
--- a/src/input/soup_input_plugin.c
+++ b/src/input/soup_input_plugin.c
@@ -246,12 +246,14 @@ input_soup_close(struct input_stream *is)
 	if (s->alive) {
 		assert(s->msg != NULL);

+		s->alive = false;
+		g_mutex_unlock(s->mutex);
+
 		soup_session_cancel_message(soup_session, s->msg,
 					    SOUP_STATUS_CANCELLED);
-		s->alive = false;
-	}
+	} else
+		g_mutex_unlock(s->mutex);

-	g_mutex_unlock(s->mutex);
 	g_mutex_free(s->mutex);
 	g_cond_free(s->cond);