From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 10 Mar 2016 10:18:51 +0000 (+0100)
Subject: service: call descrambler_service_stop outside s_stream_mutex lock
X-Git-Tag: v4.2.1~900
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f7d416ecccbb402bea93c48320b9d0ad4e7c544b;p=thirdparty%2Ftvheadend.git

service: call descrambler_service_stop outside s_stream_mutex lock
---

diff --git a/src/service.c b/src/service.c
index 4939f15a1..bc4b59ec1 100644
--- a/src/service.c
+++ b/src/service.c
@@ -345,10 +345,10 @@ service_stop(service_t *t)
 
   t->s_stop_feed(t);
 
-  pthread_mutex_lock(&t->s_stream_mutex);
-
   descrambler_service_stop(t);
 
+  pthread_mutex_lock(&t->s_stream_mutex);
+
   t->s_tt_commercial_advice = COMMERCIAL_UNKNOWN;
 
   assert(LIST_FIRST(&t->s_streaming_pad.sp_targets) == NULL);