From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 2 Oct 2014 11:05:33 +0000 (+0200)
Subject: linuxdvb: satconf - check return value from linuxdvb_satconf_find_ele(), fixes #2320
X-Git-Tag: v4.1~1230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba8d90ff48df737bdfa683dd304e2b7a3a742a5a;p=thirdparty%2Ftvheadend.git

linuxdvb: satconf - check return value from linuxdvb_satconf_find_ele(), fixes #2320
---

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_satconf.c b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
index 76738bc45..04ca8ae9d 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
@@ -583,7 +583,7 @@ linuxdvb_satconf_get_priority
   ( linuxdvb_satconf_t *ls, mpegts_mux_t *mm )
 {
   linuxdvb_satconf_ele_t *lse = linuxdvb_satconf_find_ele(ls, mm);
-  return lse->lse_priority;
+  return lse ? lse->lse_priority : 0;
 }
 
 void
@@ -601,6 +601,9 @@ linuxdvb_satconf_get_grace
   ( linuxdvb_satconf_t *ls, mpegts_mux_t *mm )
 {
   linuxdvb_satconf_ele_t *lse = linuxdvb_satconf_find_ele(ls, mm);
+  if (lse == NULL)
+    return 0;
+
   int i, r = 10;
   linuxdvb_diseqc_t      *lds[] = {
     (linuxdvb_diseqc_t*)lse->lse_en50494,