From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 4 Dec 2017 21:47:48 +0000 (+0100)
Subject: descrambler: fix another NULL dereference, fixes #4766
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fe709020b2bcaf0aa08e7b29dbb870ce691bb96;p=thirdparty%2Ftvheadend.git

descrambler: fix another NULL dereference, fixes #4766
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index bdb45cb25..98ea230d2 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -1157,7 +1157,7 @@ dd_destroy:
         if (!key_started(dr, ki) && tvhlog_limit(&dr->dr_loglimit_key, 10))
           tvhwarn(LS_DESCRAMBLER, "%s %s stream key[%d] is not valid",
                    ((mpegts_service_t *)t)->s_dvb_svcname,
-                   (ki & 0x40) ? "odd" : "even", tk->key_pid);
+                   (ki & 0x40) ? "odd" : "even", extractpid(tsb));
         goto next;
       }
       if (key_changed(dr, tk, ki, mclk())) {