Commit 5d323c17 authored Jul 08, 2019 by Andrew Chant

Catch unicode decode errors search for kernel ver

If a kernel happens to decode to gibberish (including
non-ascii bytes), catch the decoding error when
searching for the kernel version.

Bug: 137041171
Merged-In: Ic035b3a5c8c80025cb3cede7b0fdcf8a2e5a35fd
Change-Id: Ic035b3a5c8c80025cb3cede7b0fdcf8a2e5a35fd

parent f5c35100

tools/extract_kernel.py

+4 −1

Original line number	Diff line number	Diff line
		@@ -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
		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)