]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
descrambler: move lock before csa type init (clang sanitizer)
authorJaroslav Kysela <perex@perex.cz>
Thu, 10 Mar 2016 16:55:43 +0000 (17:55 +0100)
committerJaroslav Kysela <perex@perex.cz>
Thu, 10 Mar 2016 16:55:43 +0000 (17:55 +0100)
src/descrambler/descrambler.c

index 205b57f65214ccc816a5cd683443d39fc75c5be4..f7f316055f0d6553ebf0109cc00d14076f250e87 100644 (file)
@@ -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",