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

tvheadend · Mar 10, 2016 · b8492e0 · b8492e0
1 parent 9f44f72
commit b8492e0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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",