otamux: fix om_mux_cmp (removed mux in the middle of operation?), fix…

…es #3661
tvheadend · Mar 27, 2016 · 9700bb5 · 9700bb5
1 parent 5098357
commit 9700bb5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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);
 }