From 8673a71c60bfcc88d60a8762e8e62d6443b528ce Mon Sep 17 00:00:00 2001 From: Brian Potchik Date: Thu, 17 Sep 2020 15:59:03 -0400 Subject: Fix get_next_data_var_after when handling auto data variables shadowed by user data variables. --- python/binaryview.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'python/binaryview.py') diff --git a/python/binaryview.py b/python/binaryview.py index 9df7265e..5b83b01f 100644 --- a/python/binaryview.py +++ b/python/binaryview.py @@ -4346,6 +4346,9 @@ class BinaryView(object): var = core.BNDataVariable() if not core.BNGetDataVariableAtAddress(self.handle, next_data_var_start, var): return None + if var.address < next_data_var_start: + if not core.BNGetDataVariableAtAddress(self.handle, var.address + core.BNGetTypeWidth(var.type), var): + return None return DataVariable(var.address, types.Type(var.type, platform = self.platform, confidence = var.typeConfidence), var.autoDiscovered, self) def get_next_data_var_start_after(self, addr): -- cgit v1.3.1