From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 10 Mar 2016 13:27:20 +0000 (+0100)
Subject: descrambler_service_start - skip filtered CA entries for constcw decision
X-Git-Tag: v4.2.1~898
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=845bde7f6d20e2e5630db2ac73a7e3fe11b3203f;p=thirdparty%2Ftvheadend.git

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 d9a292870..205b57f65 100644
--- 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;
+        }
+    }
 
   }