Fix 'get_function_at' API for multi-arch binaries.

1 files changed, 12 insertions, 7 deletions

diff --git a/python/binaryview.py b/python/binaryview.py
index c5f8b500..1cf3a62d 100644
--- a/python/binaryview.py
+++ b/python/binaryview.py
@@ -3506,13 +3506,18 @@ class BinaryView:
 			>>>
 		"""
 		if plat is None:
-			plat = self.platform
-		if plat is None:
-			return None
-		func = core.BNGetAnalysisFunction(self.handle, plat.handle, addr)
-		if func is None:
-			return None
-		return _function.Function(self, func)
+			funcs = self.get_functions_at(addr)
+			if not funcs:
+				return None
+			result = [func for func in funcs if (func.platform == self.platform)]
+			if not result:
+				result = funcs
+			return result[0]
+		else:
+			func = core.BNGetAnalysisFunction(self.handle, plat.handle, addr)
+			if func is None:
+				return None
+			return _function.Function(self, func)
 
 	def get_functions_at(self, addr:int) -> List['_function.Function']:
 		"""