From b09164dc6c4ac8dff80b034a12f5b0e0cc9f817a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Wed, 10 Jun 2009 11:03:02 +0000 Subject: [PATCH] Proper NULL checks on xc_displayname --- src/xmltv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/xmltv.c b/src/xmltv.c index fb2b7f7a..247d7db5 100644 --- a/src/xmltv.c +++ b/src/xmltv.c @@ -138,7 +138,9 @@ static void xmltv_save(xmltv_channel_t *xc) { htsmsg_t *m = htsmsg_create_map(); - htsmsg_add_str(m, "displayname", xc->xc_displayname); + + if(xc->xc_displayname != NULL) + htsmsg_add_str(m, "displayname", xc->xc_displayname); if(xc->xc_icon != NULL) htsmsg_add_str(m, "icon", xc->xc_icon); @@ -246,7 +248,7 @@ xmltv_channel_find_by_displayname(const char *name) lock_assert(&global_lock); LIST_FOREACH(xc, &xmltv_displaylist, xc_displayname_link) - if(xc->xc_displayname && !strcmp(xc->xc_displayname, name)) + if(!strcmp(xc->xc_displayname, name)) break; return xc; }