From 240c7b7a2106db9af53eefa2371ec89d238ca03e Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Thu, 2 Aug 2012 09:59:21 +0100 Subject: [PATCH] Ensure lack of name in epggrab_channel does not cause a crash. --- src/epggrab/channel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/epggrab/channel.c b/src/epggrab/channel.c index d3df67b6..6f06015b 100644 --- a/src/epggrab/channel.c +++ b/src/epggrab/channel.c @@ -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); }