]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
descrambler: fix NULL dereference
authorJaroslav Kysela <perex@perex.cz>
Tue, 13 Jun 2017 05:46:16 +0000 (07:46 +0200)
committerJaroslav Kysela <perex@perex.cz>
Tue, 13 Jun 2017 05:46:16 +0000 (07:46 +0200)
src/descrambler/descrambler.c

index 554c13d1064469fa50111e7552b1fc6b1f3acc0d..767371535d7dbbe68b5f15e7a848b5b9daf3831f 100644 (file)
@@ -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);