From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 27 Mar 2016 18:13:24 +0000 (+0200)
Subject: otamux: fix om_mux_cmp (removed mux in the middle of operation?), fixes #3661
X-Git-Tag: v4.2.1~791
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9700bb52c45b8c2d454aae781fb79ea5de42f8ad;p=thirdparty%2Ftvheadend.git

otamux: fix om_mux_cmp (removed mux in the middle of operation?), fixes #3661
---

diff --git a/src/epggrab/otamux.c b/src/epggrab/otamux.c
index d9f3cc23c..4c29cb3e6 100644
--- a/src/epggrab/otamux.c
+++ b/src/epggrab/otamux.c
@@ -86,8 +86,11 @@ om_mux_cmp  ( epggrab_ota_mux_t *a, epggrab_ota_mux_t *b )
 {
   mpegts_mux_t *a1 = mpegts_mux_find(a->om_mux_uuid);
   mpegts_mux_t *b1 = mpegts_mux_find(b->om_mux_uuid);
-  assert(a1);
-  assert(b1);
+  if (a1 == NULL || b1 == NULL) {
+    if (a1 == NULL && b1 == NULL)
+      return 0;
+    return a1 == NULL ? 1 : -1;
+  }
   return mpegts_mux_compare(a1, b1);
 }