Fix get_next_data_var_after when handling auto data variables shadowe…

…d by user data variables.
Vector35 · Sep 17, 2020 · 8673a71 · 8673a71
1 parent 7921fd2
commit 8673a71
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/python/binaryview.py b/python/binaryview.py
@@ -4346,6 +4346,9 @@ def get_next_data_var_after(self, addr):
 		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):