Merge pull request #50 from p-x9/feature/fix-address-range

Fix calculation of segment address range
p-x9 · Feb 17, 2024 · 307fec4 · 307fec4
2 parents be22ad9 + fe7837b
commit 307fec4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/Sources/MachOKit/LoadCommand/SegmentCommand.swift b/Sources/MachOKit/LoadCommand/SegmentCommand.swift
@@ -3,7 +3,7 @@
 //
 //
 //  Created by p-x9 on 2023/11/28.
-//  
+//
 //
 
 import Foundation
@@ -12,6 +12,7 @@ public protocol SegmentCommandProtocol: LoadCommandWrapper {
     associatedtype SectionType: LayoutWrapper
     var segmentName: String { get }
     var virtualMemoryAddress: Int { get }
+    var virtualMemorySize: Int { get }
     var fileOffset: Int { get }
     var fileSize: Int { get }
     var maxProtection: VMProtection { get }
@@ -26,15 +27,15 @@ public protocol SegmentCommandProtocol: LoadCommandWrapper {
 
 extension SegmentCommandProtocol {
     public func startPtr(vmaddrSlide: Int) -> UnsafeRawPointer? {
-        let address = vmaddrSlide + virtualMemoryAddress - fileOffset
+        let address = vmaddrSlide + virtualMemoryAddress
         return UnsafeRawPointer(bitPattern: address)
     }
 
     public func endPtr(vmaddrSlide: Int) -> UnsafeRawPointer? {
         guard let start = startPtr(vmaddrSlide: vmaddrSlide) else {
             return nil
         }
-        return start + fileSize
+        return start + virtualMemorySize
     }
 }
 
@@ -53,6 +54,10 @@ public struct SegmentCommand: SegmentCommandProtocol {
         numericCast(layout.vmaddr)
     }
 
+    public var virtualMemorySize: Int {
+        numericCast(layout.vmsize)
+    }
+
     public var fileOffset: Int {
         numericCast(layout.fileoff)
     }
@@ -94,6 +99,10 @@ public struct SegmentCommand64: SegmentCommandProtocol {
         numericCast(layout.vmaddr)
     }
 
+    public var virtualMemorySize: Int {
+        numericCast(layout.vmsize)
+    }
+
     public var fileOffset: Int {
         numericCast(layout.fileoff)
     }

diff --git a/Sources/MachOKit/MachOImage+DyldChainedFixups..swift b/Sources/MachOKit/MachOImage+DyldChainedFixups..swift
@@ -29,6 +29,7 @@ extension MachOImage.DyldChainedFixups {
         }
 
         let start = linkeditStartPtr
+            .advanced(by: -numericCast(linkedit.fileoff))
             .advanced(by: numericCast(dyldChainedFixups.dataoff))
             .assumingMemoryBound(to: UInt8.self)
         let size: Int = numericCast(dyldChainedFixups.datasize)
@@ -52,6 +53,7 @@ extension MachOImage.DyldChainedFixups {
         }
 
         let start = linkeditStartPtr
+            .advanced(by: -numericCast(linkedit.fileoff))
             .advanced(by: numericCast(dyldChainedFixups.dataoff))
             .assumingMemoryBound(to: UInt8.self)
         let size: Int = numericCast(dyldChainedFixups.datasize)

diff --git a/Sources/MachOKit/MachOImage+static.swift b/Sources/MachOKit/MachOImage+static.swift
@@ -109,12 +109,12 @@ extension MachOImage {
 
 fileprivate extension MachOImage {
     var addressRange: ClosedRange<Int>? {
+        let segments = self.segments
         guard let slide = vmaddrSlide,
-              let text: any SegmentCommandProtocol = loadCommands.text64 ?? loadCommands.text,
-              let start = text.startPtr(vmaddrSlide: slide) else {
+              let start = segments.first?.startPtr(vmaddrSlide: slide),
+              let end = segments.last?.endPtr(vmaddrSlide: slide) else {
             return nil
         }
-        let end = start.advanced(by: text.fileSize)
         return Int(bitPattern: start) ... Int(bitPattern: end)
     }
 

diff --git a/Sources/MachOKit/MachOImage.swift b/Sources/MachOKit/MachOImage.swift
@@ -509,6 +509,7 @@ extension MachOImage {
         }
 
         let start = linkeditStartPtr
+            .advanced(by: -numericCast(linkedit.fileoff))
             .advanced(by: numericCast(dataInCode.dataoff))
             .assumingMemoryBound(to: DataInCodeEntry.self)
         let size: Int = numericCast(dataInCode.datasize) / MemoryLayout<DataInCodeEntry>.size