Fix fileOffset calculation for Mach-O files contained in dyld cache
#242
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Clarify conversion of raw VM addresses to file offsets - Detail handling of PAC and Objective-C tagged pointers - Note behavior for dyld shared cache scenarios
There was a problem hiding this comment.
Pull Request Overview
This PR fixes the fileOffset calculation for Mach-O files contained in dyld cache by modifying how virtual memory addresses are converted to file offsets. The key change is that fileOffset(of:) now returns an optional value and properly handles cases where addresses don't exist within the current file, particularly for dyld shared cache scenarios.
- Updated
fileOffset(of:)method to returnnilwhen addresses cannot be resolved to the current file - Renamed
stringOffsettostringAddressin CFString protocol for clarity - Added proper handling for dyld shared cache file offset resolution
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| Sources/MachOKit/Model/CoreFoundation/CFString.swift | Renamed stringOffset to stringAddress, updated string extraction logic to handle optional file offsets, and added deprecated property for backward compatibility |
| Sources/MachOKit/MachOFile.swift | Modified fileOffset(of:) to return optional and handle dyld cache scenarios, updated classic binding symbols to handle nil file offsets |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.