Die if we fail to parse the XML returned by the MythTV backend.

diff --git a/ChangeLog b/ChangeLog
index 5fe7c3a7298c4620c76c89ee545907fd24955aaa..7b8d52e50b1ee30f3aa13b71f5c27a4de349b62c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-11-28     Andrew Ruthven
+       Be more wary about processing what the backend has sent us.
+
 2007-11-23     Andrew Ruthven
        Don't set the background when changing the colour.
        Make the new debconf prompt lintian clean and say how to specify

diff --git a/bin/mythtv-status b/bin/mythtv-status
index f4673ae01c4e833829066dc50377983fe7e83213..a679eaef104a41f5bbdada4627214ff1b19c1b11 100755 (executable)
--- a/bin/mythtv-status
+++ b/bin/mythtv-status
@@ -282,7 +282,13 @@ sub load_xml {
 
   # Parse the XML
   my $parser = XML::LibXML->new();
-  return eval { $parser->parse_string( $status ) };
+  my $xml = eval { $parser->parse_string( $status ) };
+
+  if ($@) {
+    die "Failed to parse XML from $url: $@\n";
+  }
+
+  return $xml;
 }