mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

prevent possible segfault std::string if value NULL

Browse Source
This commit is contained in:
Jacek Jendrzej
2015-03-20 11:57:12 +01:00
parent 632ecc3b1e
commit 40fe7fae34
5 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/eitd/xmlutil.cpp
View File

@@ -271,12 +271,15 @@ void deleteOldfileEvents(char *epgdir)
filter = filter->xmlChildrenNode;
while (filter) {
filename = xmlGetAttribute(filter, "name");
file = epgdir;
file +="/";
file +=filename;
unlink(file.c_str());
filter = filter->xmlNextNode;
const char * name = xmlGetAttribute(filter, "name");
if(name){
filename=name;
file = epgdir;
file +="/";
file +=filename;
unlink(file.c_str());
filter = filter->xmlNextNode;
}
}
xmlFreeDoc(filter_parser);
}
@@ -313,7 +316,10 @@ void *insertEventsfromFile(void * data)
eventfile = xmlDocGetRootElement(index_parser)->xmlChildrenNode;
while (eventfile) {
filename = xmlGetAttribute(eventfile, "name");
const char * name = xmlGetAttribute(eventfile, "name");
if(name)
filename=name;
epgname = epg_dir + filename;
if (!(event_parser = parseXmlFile(epgname.c_str()))) {
dprintf("unable to open %s for reading\n", epgname.c_str());