]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Ensure lack of name in epggrab_channel does not cause a crash.
authorAdam Sutton <dev@adamsutton.me.uk>
Thu, 2 Aug 2012 08:59:21 +0000 (09:59 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Thu, 2 Aug 2012 08:59:21 +0000 (09:59 +0100)
src/epggrab/channel.c

index d3df67b6243b195850fefb4e5f9447e2ce1ce3d2..6f06015bd04627de7dafa49a2231ded7317aed7b 100644 (file)
@@ -184,10 +184,11 @@ htsmsg_t *epggrab_channel_list ( void )
         e = htsmsg_create_map();
         htsmsg_add_str(e, "module", mod->id);
         htsmsg_add_str(e, "id",     ec->id);
-        htsmsg_add_str(e, "name",   ec->name);
+        if (ec->name)
+          htsmsg_add_str(e, "name",   ec->name);
         sprintf(name, "%s|%s", mod->id, ec->id);
         htsmsg_add_str(e, "mod-id", name);
-        sprintf(name, "%s: %s", mod->name, ec->name);
+        sprintf(name, "%s: %s", mod->name, ec->name ?: "unknown");
         htsmsg_add_str(e, "mod-name", name);
         htsmsg_add_msg(m, NULL, e);
       }