From 5a72923690bf79a80fdf4d9d85f46ec9ba82f871 Mon Sep 17 00:00:00 2001
From: anat0lius <avbit@tuta.io>
Date: Thu, 25 Feb 2021 18:52:49 +0100
Subject: [PATCH] Added handling of malformed xml files

---
 xmldiffs | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/xmldiffs b/xmldiffs
index fc4db2b..35f1b1e 100755
--- a/xmldiffs
+++ b/xmldiffs
@@ -82,20 +82,28 @@ else:
         return fp
 
 def xmldiffs(file1, file2, diffargs=["-u"]):
-    tree = ET.parse(file1)
-    tmp1 = unicode_writer(NamedTemporaryFile('w'))
-    write_sorted(tmp1, tree.getroot())
-    tmp1.flush()
-
-    tree = ET.parse(file2)
-    tmp2 = unicode_writer(NamedTemporaryFile('w'))
-    write_sorted(tmp2, tree.getroot())
-    tmp2.flush()
+    try:
+        tree = ET.parse(file1)
+        tmp1 = unicode_writer(NamedTemporaryFile('w'))
+        write_sorted(tmp1, tree.getroot())
+        tmp1.flush()
+        actual = tmp1.name
+    except ET.ParseError:
+        actual = file1
+
+    try:
+        tree = ET.parse(file2)
+        tmp2 = unicode_writer(NamedTemporaryFile('w'))
+        write_sorted(tmp2, tree.getroot())
+        tmp2.flush()
+        expected = tmp2.name
+    except ET.ParseError:
+        expected = file2
 
     args = [ "diff" ]
     args += diffargs
     args += [ "--label", file1, "--label", file2 ]
-    args += [ tmp1.name, tmp2.name ]
+    args += [ actual, expected ]
 
     return subprocess.call(args)