commit 2b4828a56494c69d4c531baa6f48ba5af121febd
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jul 15 18:33:57 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 15 18:33:57 2019 +0000
tree 3f2ab25557311cc28253591285d54cdf5042a922
parent f70815cbd26378626e7e9052928b3f9f92c53085
parent 5d323c17142bc9f3556a578342e06be0412901a4

Merge "Catch unicode decode errors search for kernel ver"

tools/extract_kernel.py

diff --git a/tools/extract_kernel.py b/tools/extract_kernel.py
index 16ccb22..42561cf 100755
--- a/tools/extract_kernel.py
+++ b/tools/extract_kernel.py
@@ -47,7 +47,10 @@
   null_idx = input_bytes.find('\x00', start_idx)
   if null_idx < 0:
     return None
-  linux_banner = input_bytes[start_idx:null_idx].decode()
+  try:
+    linux_banner = input_bytes[start_idx:null_idx].decode()
+  except UnicodeDecodeError:
+    return None
   mo = re.match(LINUX_BANNER_REGEX, linux_banner)
   if mo:
     return mo.group(1)