mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
prevent possible segfault std::string if value NULL
Origin commit data
------------------
Branch: ni/coolstream
Commit: 40fe7fae34
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-20 (Fri, 20 Mar 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -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());
|
||||
|
Reference in New Issue
Block a user