From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 22 Oct 2015 16:02:47 +0000 (+0200)
Subject: epggrab: channels - fix crash for EIT/PSIP
X-Git-Tag: v4.2.1~1808
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=076cb9ce3816ef8722073aeb47484ccfbdd1c8ab;p=thirdparty%2Ftvheadend.git

epggrab: channels - fix crash for EIT/PSIP
---

diff --git a/src/epggrab/channel.c b/src/epggrab/channel.c
index a01be7252..11c6965bc 100644
--- a/src/epggrab/channel.c
+++ b/src/epggrab/channel.c
@@ -217,6 +217,8 @@ epggrab_channel_t *epggrab_channel_create
 {
   epggrab_channel_t *ec;
 
+  assert(owner->channels);
+
   if (htsmsg_get_str(conf, "id") == NULL)
     return NULL;
 
@@ -337,9 +339,10 @@ void epggrab_channel_add ( channel_t *ch )
   epggrab_channel_t *egc;
 
   LIST_FOREACH(mod, &epggrab_modules, link)
-    RB_FOREACH(egc, mod->channels, link)
-      if (epggrab_channel_match_and_link(egc, ch))
-        break;
+    if (mod->channels)
+      RB_FOREACH(egc, mod->channels, link)
+        if (epggrab_channel_match_and_link(egc, ch))
+          break;
 }
 
 void epggrab_channel_rem ( channel_t *ch )