Merge "Catch unicode decode errors search for kernel ver"

am: 2b4828a564 Change-Id: Ieed4020a6490d44c4be1780eec08e501ed1e2219
2019-07-15 11:58:41 -07:00 · 2019-07-15 11:58:41 -07:00 · 1db284ff10
parent 09f64c0cd5 2b4828a564
commit 1db284ff10
1 changed files with 4 additions and 1 deletions
--- a/tools/extract_kernel.py
+++ b/tools/extract_kernel.py
@ -47,7 +47,10 @@ def get_version(input_bytes, start_idx):
  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)