Refactor null terminated string reading

p-x9 · Jun 13, 2024 · 1b21b68 · 1b21b68
1 parent 657891c
commit 1b21b68
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/Sources/MachOKit/Extension/UnsafePointer+.swift b/Sources/MachOKit/Extension/UnsafePointer+.swift
@@ -62,3 +62,12 @@ extension UnsafePointer<UInt8> {
         return (string, offset)
     }
 }
+
+extension UnsafePointer<CChar> {
+    func readString() -> (String, Int) {
+        let offset = Int(bitPattern: strchr(self, 0)) + 1 - Int(bitPattern: self)
+        let string = String(cString: self)
+
+        return (string, offset)
+    }
+}
diff --git a/Sources/MachOKit/MachOFile+Strings.swift b/Sources/MachOKit/MachOFile+Strings.swift
@@ -60,15 +60,12 @@ extension MachOFile.Strings {
 
                 let ptr = baseAddress
                     .advanced(by: nextOffset)
-                    .assumingMemoryBound(to: CChar.self)
-                let string = String(cString: ptr)
-
-                let nextPointer = UnsafePointer(strchr(ptr, 0))
-                    .advanced(by: 1)
+                    .assumingMemoryBound(to: UInt8.self)
+                let (string, offset) = ptr.readString()
 
                 let result = Element(string: string, offset: nextOffset)
 
-                nextOffset += Int(bitPattern: nextPointer) - Int(bitPattern: ptr)
+                nextOffset += offset
 
                 return  result
             }

diff --git a/Sources/MachOKit/MachOImage+Strings.swift b/Sources/MachOKit/MachOImage+Strings.swift
@@ -72,9 +72,8 @@ extension MachOImage.Strings {
             if offset >= tableSize {
                 return nil
             }
-            let string = String(cString: nextPointer)
-            nextPointer = UnsafePointer(strchr(nextPointer, 0))
-                .advanced(by: 1)
+            let (string, nextOffset) = nextPointer.readString()
+            nextPointer = nextPointer.advanced(by: nextOffset)
 
             return .init(string: string, offset: offset)
         }