stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

iptv: fix iptv_lock mutex deadlock for http client, fixes #2465

Browse source
This commit is contained in:
Jaroslav Kysela 2014-11-11 10:12:48 +01:00
parent 3cc291c2ed
commit 6c6c69d81c
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/input/mpegts/iptv/iptv_http.c
View file

@ -92,7 +92,9 @@ static void
iptv_http_stop
( iptv_mux_t *im )
{
pthread_mutex_unlock(&iptv_lock);
http_client_close(im->im_data);
pthread_mutex_lock(&iptv_lock);
}

2
src/input/mpegts/iptv/iptv_udp.c
View file

@ -66,8 +66,10 @@ iptv_udp_stop
udp_multirecv_t *um = im->im_data;
im->im_data = NULL;
pthread_mutex_unlock(&iptv_lock);
udp_multirecv_free(um);
free(um);
pthread_mutex_lock(&iptv_lock);
}
static ssize_t