descrambler_service_start - skip filtered CA entries for constcw decision

- also constcw_table might be NULL

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index d9a29287012cbd99d0c6ba0feb5d5e951df92c7e..205b57f65214ccc816a5cd683443d39fc75c5be4 100644 (file)
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -248,7 +248,8 @@ descrambler_service_start ( service_t *t )
     count = 0;
     TAILQ_FOREACH(st, &t->s_filt_components, es_filt_link)
       LIST_FOREACH(ca, &st->es_caids, link) {
-        for (p = constcw_table; *p; p++)
+        if (ca->use == 0) continue;
+        for (p = constcw_table; p && *p; p++)
           if (ca->caid == *p) {
             constcw = 1;
             break;
@@ -262,11 +263,13 @@ descrambler_service_start ( service_t *t )
 
   } else {
 
-    for (p = constcw_table; *p; p++)
-      if (*p == ((mpegts_service_t *)t)->s_dvb_forcecaid) {
-        constcw = 1;
-        break;
-      }
+    if (constcw_table) {
+      for (p = constcw_table; *p; p++)
+        if (*p == ((mpegts_service_t *)t)->s_dvb_forcecaid) {
+          constcw = 1;
+          break;
+        }
+    }
 
   }