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

tvheadend · Nov 11, 2014 · 6c6c69d · 6c6c69d
1 parent 3cc291c
commit 6c6c69d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/input/mpegts/iptv/iptv_http.c b/src/input/mpegts/iptv/iptv_http.c
@@ -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);
 }
 
 

diff --git a/src/input/mpegts/iptv/iptv_udp.c b/src/input/mpegts/iptv/iptv_udp.c
@@ -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