]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
descrambler: fix wrongly added lock in descrambler_notify_nokey(), fixes #5092
authorJaroslav Kysela <perex@perex.cz>
Fri, 14 Sep 2018 08:37:32 +0000 (10:37 +0200)
committerJaroslav Kysela <perex@perex.cz>
Fri, 14 Sep 2018 08:37:32 +0000 (10:37 +0200)
src/descrambler/descrambler.c

index c7431610a51362fc87ca568db33ab802e65a3bd9..ddbd1f573e06fee6b1f438832e89473e0c89082c 100644 (file)
@@ -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