From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 13 Jun 2017 05:46:16 +0000 (+0200)
Subject: descrambler: fix NULL dereference
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11b2611f81ff716b967133d0f169da7da2b38ba0;p=thirdparty%2Ftvheadend.git

descrambler: fix NULL dereference
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index 554c13d10..767371535 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -1015,7 +1015,7 @@ descrambler_descramble ( service_t *t,
       if (dr->dr_key_multipid) {
         tk = key_find_struct(dr, tk, tsb2, t);
         if (tk == NULL) {
-          if (t->s_start_time + MAX(3000000, tk->key_interval) < mclk() &&
+          if (t->s_start_time + 3000000 < mclk() &&
               tvhlog_limit(&dr->dr_loglimit_key, 10))
             tvhwarn(LS_DESCRAMBLER, "%s stream key[%d] is not available",
                     ((mpegts_service_t *)t)->s_dvb_svcname, tk->key_pid);