oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/soup: unlock before cancelling the soup message

Browse Source 
Avoid recursive deadlock in _session_callback().
This commit is contained in:
Max Kellermann 2011-09-15 21:13:46 +02:00
parent 9ea8a840a9
commit 0ef15e5fac
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/input/soup_input_plugin.c
View File

@ -246,12 +246,14 @@ input_soup_close(struct input_stream *is)
if (s->alive) { if (s->alive) {
assert(s->msg != NULL); assert(s->msg != NULL);
s->alive = false;
g_mutex_unlock(s->mutex);
soup_session_cancel_message(soup_session, s->msg, soup_session_cancel_message(soup_session, s->msg,
SOUP_STATUS_CANCELLED); SOUP_STATUS_CANCELLED);
s->alive = false; } else
}
g_mutex_unlock(s->mutex); g_mutex_unlock(s->mutex);
g_mutex_free(s->mutex); g_mutex_free(s->mutex);
g_cond_free(s->cond); g_cond_free(s->cond);