From 55b060c703780ba0dd6e592e67378f0b2e3dfeb0 Mon Sep 17 00:00:00 2001
From: Patrick Daly <pdaly@codeaurora.org>
Date: Fri, 24 Feb 2017 18:55:25 -0800
Subject: [PATCH] lrdp-v2: Fix read_structure_field crash
When calling read_structure_field with an undefined symbol, the
desired behavior is to return None rather than crash.
Change-Id: Iaf172a038779cf767b55c47ec37b8e90e194aa0f
---
linux-ramdump-parser-v2/ramdump.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/linux-ramdump-parser-v2/ramdump.py b/linux-ramdump-parser-v2/ramdump.py
index 1b1a59d..11cd28c 100755
--- a/linux-ramdump-parser-v2/ramdump.py
+++ b/linux-ramdump-parser-v2/ramdump.py
@@ -1317,6 +1317,9 @@ class RamDump():
"""reads a 4 or 8 byte field from a structure"""
size = self.sizeof("(({0} *)0)->{1}".format(struct_name, field))
virt = self.resolve_virt(addr_or_name)
+ if virt is None or size is None:
+ return None
+
if size == 4:
return self.read_u32(virt + self.field_offset(struct_name,
field))
--
GitLab