descrambler: add missing s_stream_mutex lock to descrambler_external()

tvheadend · Oct 17, 2016 · 8a6deb8 · 8a6deb8
1 parent 9584fd2
commit 8a6deb8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
@@ -422,6 +422,8 @@ descrambler_external ( service_t *t, int state )
 {
   th_descrambler_runtime_t *dr;
 
+  lock_assert(&t->s_stream_mutex);
+
   if (t == NULL || (dr = t->s_descramble) == NULL)
     return;
   dr->dr_external = state ? 1 : 0;

diff --git a/src/descrambler/dvbcam.c b/src/descrambler/dvbcam.c
@@ -187,7 +187,9 @@ dvbcam_pmt_data(mpegts_service_t *s, const uint8_t *ptr, int len)
 
 enqueue:
   if (as->ca) {
+    pthread_mutex_lock(&s->s_stream_mutex);
     descrambler_external((service_t *)s, 1);
+    pthread_mutex_unlock(&s->s_stream_mutex);
     linuxdvb_ca_enqueue_capmt(as->ca, as->slot, as->last_pmt, as->last_pmt_len,
                               list_mgmt, CA_PMT_CMD_ID_OK_DESCRAMBLING);
   }