Chris Lamb · Chris Lamb · 7b0cff62 · 7b0cff62 · 7b0cff62 · 7b0cff62
--- a/diffoscope/__init__.py
+++ b/diffoscope/__init__.py
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2021 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/__init__.py
+++ b/diffoscope/comparators/__init__.py
@@ -3,7 +3,7 @@
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
 # Copyright ©      2015  Helmut Grohne <helmut@subdivi.de>
-# Copyright © 2015-2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/binwalk.py
+++ b/diffoscope/comparators/binwalk.py
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2017-2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2017-2020, 2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/cbfs.py
+++ b/diffoscope/comparators/cbfs.py
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2016-2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2016-2020, 2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/deb.py
+++ b/diffoscope/comparators/deb.py
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2021 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/decompile.py
+++ b/diffoscope/comparators/decompile.py
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2020 Jean-Romain Garnier <salsa@jean-romain.com>
-# Copyright © 2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2020-2021 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/device.py
+++ b/diffoscope/comparators/device.py
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2021 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/elf.py
+++ b/diffoscope/comparators/elf.py
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2021 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/haskell.py
+++ b/diffoscope/comparators/haskell.py
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2020, 2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -127,9 +127,13 @@ class HiFile(File):
                length = buf[0]

            # Now read characters; each is 32-bit big-endian.
-            version_found = "".join(
-                chr(struct.unpack(">I", fp.read(4))[0]) for _ in range(length)
-            )
+            try:
+                version_found = "".join(
+                    chr(struct.unpack(">I", fp.read(4))[0]) for _ in range(length)
+                )
+            except ValueError:
+                # Don't traceback if we encounter and invalid Unicode character.
+                version_found = "(unknown)"

            if version_found != HiFile.hi_version:
                logger.debug(

--- a/diffoscope/comparators/macho.py
+++ b/diffoscope/comparators/macho.py
@@ -3,7 +3,7 @@
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
 # Copyright © 2015 Clemens Lang <cal@macports.org>
-# Copyright © 2016-2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2016-2021 Chris Lamb <lamby@debian.org>
 # Copyright © 2021 Jean-Romain Garnier <salsa@jean-romain.com>
 #
 # diffoscope is free software: you can redistribute it and/or modify

--- a/diffoscope/comparators/missing_file.py
+++ b/diffoscope/comparators/missing_file.py
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2016-2017, 2019-2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2016-2017, 2019-2021 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/pdf.py
+++ b/diffoscope/comparators/pdf.py
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2016, 2018-2021 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2016, 2018-2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/python.py
+++ b/diffoscope/comparators/python.py
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2021‒2022 Chris Lamb <lamby@debian.org>
+# Copyright © 2021-2022 Chris Lamb <lamby@debian.org>
 # Copyright © 2021 Sergei Trofimovich
 #
 # diffoscope is free software: you can redistribute it and/or modify

--- a/diffoscope/comparators/rpm.py
+++ b/diffoscope/comparators/rpm.py
@@ -3,7 +3,7 @@
 #
 # Copyright © 2015 Reiner Herrmann <reiner@reiner-h.de>
 # Copyright © 2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2021 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/rpm_fallback.py
+++ b/diffoscope/comparators/rpm_fallback.py
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2016, 2018-2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2016, 2018-2021 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/sphinx.py
+++ b/diffoscope/comparators/sphinx.py
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2021 Chris Lamb <lamby@debian.org>
+# Copyright © 2021-2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/symlink.py
+++ b/diffoscope/comparators/symlink.py
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2021 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/utils/compare.py
+++ b/diffoscope/comparators/utils/compare.py
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2016-2020 Chris Lamb <lamby@debian.org>
+# Copyright © 2016-2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/utils/container.py
+++ b/diffoscope/comparators/utils/container.py
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2016-2021 Chris Lamb <lamby@debian.org>
+# Copyright © 2016-2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

--- a/diffoscope/comparators/utils/libarchive.py
+++ b/diffoscope/comparators/utils/libarchive.py
@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2016-2021 Chris Lamb <lamby@debian.org>
+# Copyright © 2016-2022 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by