From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 10 Mar 2016 16:55:43 +0000 (+0100)
Subject: descrambler: move lock before csa type init (clang sanitizer)
X-Git-Tag: v4.2.1~896
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8492e02f5dc507b31140df3bcb6d3e009810c00;p=thirdparty%2Ftvheadend.git

descrambler: move lock before csa type init (clang sanitizer)
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index 205b57f65..f7f316055 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -429,11 +429,11 @@ descrambler_keys ( th_descrambler_t *td, int type,
     return;
   }
 
-  if (tvhcsa_set_type(&dr->dr_csa, type) < 0)
-    return;
-
   pthread_mutex_lock(&t->s_stream_mutex);
 
+  if (tvhcsa_set_type(&dr->dr_csa, type) < 0)
+    goto fin;
+
   LIST_FOREACH(td2, &t->s_descramblers, td_service_link)
     if (td2 != td && td2->td_keystate == DS_RESOLVED) {
       tvhlog(LOG_DEBUG, "descrambler",