stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix one-shot memory leak in xmltv (loaded configuration)

Browse source
This commit is contained in:
Andreas Öman 2008-09-24 15:42:09 +00:00
parent ad6ea1b8e1
commit e919cbae87
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
xmltv.c
View file

@ -115,17 +115,19 @@ xmltv_load(void)
htsmsg_field_t *f;
xmltv_channel_t *xc;
if((l = hts_settings_load("xmltv/channels")) != NULL) {
HTSMSG_FOREACH(f, l) {
if((c = htsmsg_get_msg_by_field(f)) == NULL)
continue;
xc = xmltv_channel_find(f->hmf_name, 1);
tvh_str_set(&xc->xc_icon, htsmsg_get_str(c, "icon"));
xc_set_displayname(xc, htsmsg_get_str(c, "displayname"));
}
if((l = hts_settings_load("xmltv/channels")) == NULL)
return;
HTSMSG_FOREACH(f, l) {
if((c = htsmsg_get_msg_by_field(f)) == NULL)
continue;
xc = xmltv_channel_find(f->hmf_name, 1);
tvh_str_set(&xc->xc_icon, htsmsg_get_str(c, "icon"));
xc_set_displayname(xc, htsmsg_get_str(c, "displayname"));
}
htsmsg_destroy(l);
}
@ -762,6 +764,8 @@ xmltv_grabbers_load(void)
if((xg = xmltv_grabber_find_by_path(path)) != NULL)
xg_current = xg;
}
htsmsg_destroy(m);
}