mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 19:01:13 +02:00
sectionsd: don't crash when reading old saved EPG
Origin commit data
------------------
Branch: ni/coolstream
Commit: f9e28c8594
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-30 (Sun, 30 Sep 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -276,6 +276,7 @@ void *insertEventsfromFile(void * data)
|
|||||||
xmlNodePtr service = NULL;
|
xmlNodePtr service = NULL;
|
||||||
xmlNodePtr event = NULL;
|
xmlNodePtr event = NULL;
|
||||||
xmlNodePtr node = NULL;
|
xmlNodePtr node = NULL;
|
||||||
|
xmlNodePtr tmp = NULL;
|
||||||
t_original_network_id onid = 0;
|
t_original_network_id onid = 0;
|
||||||
t_transport_stream_id tsid = 0;
|
t_transport_stream_id tsid = 0;
|
||||||
t_service_id sid = 0;
|
t_service_id sid = 0;
|
||||||
@@ -344,7 +345,11 @@ void *insertEventsfromFile(void * data)
|
|||||||
node = node->xmlNextNode;
|
node = node->xmlNextNode;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
while (xmlGetNextOccurence(node, "extended_text") != NULL) {
|
while ((tmp = xmlGetNextOccurence(node, "extended_text")) != NULL) {
|
||||||
|
/* old data could contain "item" and "item_description", if
|
||||||
|
* USE_ITEM_DESCRIPTION is not set, not would now still point
|
||||||
|
* to one of those and "(node, lang)" would be NULL */
|
||||||
|
node = tmp;
|
||||||
e.appendExtendedText( std::string(ZapitTools::UTF8_to_Latin1(xmlGetAttribute(node, "lang"))),
|
e.appendExtendedText( std::string(ZapitTools::UTF8_to_Latin1(xmlGetAttribute(node, "lang"))),
|
||||||
std::string(xmlGetAttribute(node, "string")));
|
std::string(xmlGetAttribute(node, "string")));
|
||||||
node = node->xmlNextNode;
|
node = node->xmlNextNode;
|
||||||
|
Reference in New Issue
Block a user