handle XML parsing errors when loading the external channel map

kodi-pvr · Jun 15, 2015 · e63005c · e63005c
1 parent 2273819
commit e63005c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/vbox/GuideChannelMapper.cpp b/src/vbox/GuideChannelMapper.cpp
@@ -22,6 +22,7 @@
 #include "GuideChannelMapper.h"
 #include <memory>
 #include "lib/tinyxml2/tinyxml2.h"
+#include "Exceptions.h"
 #include "Utilities.h"
 #include "../client.h"
 
@@ -79,10 +80,13 @@ void GuideChannelMapper::Load()
 
   if (fileHandle)
   {
-    // Parse the document
+    // Read the XML
     tinyxml2::XMLDocument document;
     std::unique_ptr<std::string> contents = utilities::ReadFileContents(fileHandle);
-    document.Parse(contents->c_str());
+
+    // Try to parse the document
+    if (document.Parse(contents->c_str(), contents->size()) != XML_NO_ERROR)
+      throw vbox::InvalidXMLException("XML parsing failed: " + std::string(document.ErrorName()));
 
     // Create mappings
     for (const XMLElement *element = document.RootElement()->FirstChildElement("mapping");