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

diff --git a/src/input/mpegts/iptv/iptv_http.c b/src/input/mpegts/iptv/iptv_http.c
index 8c43b418cba71bf0aff58357418f715fd89c63c9..546567e951de95b7cea7ed44d5f2912d4e35001c 100644 (file)
--- 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
index 025f2983fadc502355b09bab3d272678e44927e9..06009fdb57cf63cc4bc5d6cd12a8de6031887666 100644 (file)
--- 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