From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 17 Oct 2016 15:15:16 +0000 (+0200)
Subject: descrambler: fix NULL deference - fixes #4027
X-Git-Tag: v4.2.1~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9584fd2ea1fa8ff805a25447ad0221ba27c79e71;p=thirdparty%2Ftvheadend.git

descrambler: fix NULL deference - fixes #4027
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index abc44a804..a3cd1f6d4 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -683,7 +683,7 @@ descrambler_descramble ( service_t *t,
       ts_recv_packet2((mpegts_service_t *)t, tsb, len);
       return 1;
     }
-    return dr->dr_external ? 1 : -1;
+    return dr && dr->dr_external ? 1 : -1;
   }
 
   if (dr->dr_csa.csa_type == DESCRAMBLER_NONE && dr->dr_queue_total == 0)