From 6c4619c0e3216f51f6e69071c7ce2a3e909b6a74 Mon Sep 17 00:00:00 2001
From: Brian Potchik <brian@vector35.com>
Date: Sat, 12 Jul 2025 21:18:14 -0400
Subject: Fix GetDataOffsetForAddress API to properly work for mapped load
 regions only.

---
 binaryview.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'binaryview.cpp')

diff --git a/binaryview.cpp b/binaryview.cpp
index 6585f5c4..433767c0 100644
--- a/binaryview.cpp
+++ b/binaryview.cpp
@@ -5038,9 +5038,8 @@ bool BinaryView::GetAddressForDataOffset(uint64_t offset, uint64_t& addr)
 bool BinaryView::GetDataOffsetForAddress(uint64_t addr, uint64_t& offset)
 {
 	auto segment = GetSegmentAt(addr);
-	if (segment && segment->GetStart() <= addr && addr < segment->GetEnd())
+	if (segment && segment->GetDataLength() && (segment->GetStart() <= addr) && (addr < segment->GetEnd()))
 	{
-		offset = 0;
 		offset = addr - segment->GetStart() + segment->GetDataOffset();
 		return true;
 	}
-- 
cgit v1.3.1