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

eitd/xmlutil.cpp: fix crash, if epg data saved with older image -

Browse Source 
item/item_description can be present and break parsing
This commit is contained in:
[CST] Focus
2012-11-15 19:13:13 +04:00
parent b478212140
commit 1f65f1bc80
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/eitd/xmlutil.cpp
View File

@@ -334,16 +334,18 @@ void *insertEventsfromFile(void * data)
std::string(xmlGetAttribute(node, "string"))); std::string(xmlGetAttribute(node, "string")));
node = node->xmlNextNode; node = node->xmlNextNode;
} }
#ifdef USE_ITEM_DESCRIPTION
while (xmlGetNextOccurence(node, "item") != NULL) { while (xmlGetNextOccurence(node, "item") != NULL) {
#ifdef USE_ITEM_DESCRIPTION
e.item = std::string(xmlGetAttribute(node, "string")); e.item = std::string(xmlGetAttribute(node, "string"));
#endif
node = node->xmlNextNode; node = node->xmlNextNode;
} }
while (xmlGetNextOccurence(node, "item_description") != NULL) { while (xmlGetNextOccurence(node, "item_description") != NULL) {
#ifdef USE_ITEM_DESCRIPTION
e.itemDescription = std::string(xmlGetAttribute(node, "string")); e.itemDescription = std::string(xmlGetAttribute(node, "string"));
#endif
node = node->xmlNextNode; node = node->xmlNextNode;
} }
#endif
while (xmlGetNextOccurence(node, "extended_text") != NULL) { while (xmlGetNextOccurence(node, "extended_text") != NULL) {
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")));