Fix loading .gnu_debugdata when loading an ELF with non-zero base

1 files changed, 4 insertions, 2 deletions

diff --git a/view/elf/elfview.cpp b/view/elf/elfview.cpp
index d6e9006e..c87c9e05 100644
--- a/view/elf/elfview.cpp
+++ b/view/elf/elfview.cpp
@@ -2700,7 +2700,9 @@ void ElfView::ParseMiniDebugInfo()
 		return;
 	}
 
-	Ref<BinaryView> debugBv = Load(debugElf, false);
+	// Load debug bv at same address as this bv
+	string debugBvOptions = fmt::format("{{\"loader.imageBase\": {}}}", GetStart());
+	Ref<BinaryView> debugBv = Load(debugElf, false, debugBvOptions);
 	if (!debugBv)
 	{
 		m_logger->LogError("Invalid .gnu_debugdata contents: Failed to create BinaryView");
@@ -2712,7 +2714,7 @@ void ElfView::ParseMiniDebugInfo()
 		DefineElfSymbol(
 			symbol->GetType(),
 			symbol->GetRawName(),
-			GetStart() + symbol->GetAddress(),
+			symbol->GetAddress(),
 			false,
 			symbol->GetBinding()
 		);