From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 11 Nov 2015 13:56:56 +0000 (+0100)
Subject: mpegts: correct logic for DVB_TYPE (tvhdhomerun)
X-Git-Tag: v4.2.1~1575
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4dd5f7118c8596aa0faf5c9f4f03b1cad66d491d;p=thirdparty%2Ftvheadend.git

mpegts: correct logic for DVB_TYPE (tvhdhomerun)
---

diff --git a/src/input/mpegts/mpegts_network_dvb.c b/src/input/mpegts/mpegts_network_dvb.c
index b7eecd7ea..79bd97406 100644
--- a/src/input/mpegts/mpegts_network_dvb.c
+++ b/src/input/mpegts/mpegts_network_dvb.c
@@ -605,6 +605,7 @@ dvb_network_create0
 
   ln = calloc(1, sizeof(dvb_network_t));
   ln->ln_type = dvb_fe_type_by_network_class(idc);
+  assert(ln->ln_type != DVB_TYPE_NONE);
 
   /* Create */
   if (!(ln = (dvb_network_t*)mpegts_network_create0((void*)ln,
diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
index 1e8874abf..bd32e75c9 100644
--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
@@ -622,7 +622,7 @@ tvhdhomerun_frontend_create(tvhdhomerun_device_t *hd, struct hdhomerun_discover_
     uuid = htsmsg_get_str(conf, "uuid");
 
   /* Class */
-  if (!(idc = dvb_network_class_by_fe_type(type))) {
+  if (!(idc = dvb_network_class_by_fe_type(type)) || type == DVB_TYPE_S) {
     tvherror("tvhdhomerun", "unknown FE type %d", type);
     return NULL;
   }