From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 3 Dec 2017 08:54:26 +0000 (+0100)
Subject: descrambler: fix another crash, issue #4749
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11616eac7ff960b353ed0fcda370699a5639aec1;p=thirdparty%2Ftvheadend.git

descrambler: fix another crash, issue #4749
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index 8cacef694..6d7dd3f65 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -873,7 +873,7 @@ key_valid ( th_descrambler_key_t *tk, uint8_t ki )
 {
   /* 0x40 (for even) or 0x80 (for odd) */
   uint8_t mask = ((ki & 0x40) + 0x40);
-  return tk->key_valid & mask;
+  return tk && (tk->key_valid & mask);
 }
 
 static inline int