From 93bc8432c6473a65c2e8aa7f82bbfd59102f14cd Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 14 Sep 2018 10:37:32 +0200 Subject: [PATCH] descrambler: fix wrongly added lock in descrambler_notify_nokey(), fixes #5092 --- src/descrambler/descrambler.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 -- 2.47.2