From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 14 Sep 2018 08:37:32 +0000 (+0200)
Subject: descrambler: fix wrongly added lock in descrambler_notify_nokey(), fixes #5092
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93bc8432c6473a65c2e8aa7f82bbfd59102f14cd;p=thirdparty%2Ftvheadend.git

descrambler: fix wrongly added lock in descrambler_notify_nokey(), fixes #5092
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index c7431610a..ddbd1f573 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -487,6 +487,7 @@ descrambler_notify_deliver( mpegts_service_t *t, descramble_info_t *di )
   streaming_service_deliver((service_t *)t, sm);
 }
 
+/* it's called inside s_stream_mutex lock! */
 static void
 descrambler_notify_nokey( th_descrambler_runtime_t *dr )
 {
@@ -497,10 +498,8 @@ descrambler_notify_nokey( th_descrambler_runtime_t *dr )
 
   di = calloc(1, sizeof(*di));
 
-  pthread_mutex_lock(&t->s_stream_mutex);
   di->pid = t->s_components.set_pmt_pid;
   descrambler_notify_deliver(t, di);
-  pthread_mutex_unlock(&t->s_stream_mutex);
 }
 
 void