fix: Change paths where we look for dyld and support multiple restore images #8
Conversation
This file contains 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
Swatinem
approved these changes
Sep 28, 2022
| or prefix == "ios" | ||
| and parsed_version >= version.parse("16.0") | ||
| ): | ||
| system_restore_image_filename = read_build_manifest_plist(extract_dir) |
There was a problem hiding this comment.
this here yields a single value, whereas the other branch yields an iterator. why exactly is that?
There was a problem hiding this comment.
The Restore.plist contains 2 possible restore images, one for a base system and one seemingly being the real system. We were extracting from the base system so far which is why our symbols were incomplete. I'm returning both images here and will loop through both to extract symbols.
As for the BuildManifest.plist, we only found the Cryptex1,SystemOS image being useful to access the dyld we want, so that's why it's returning only one value. Maybe in the future we'll need/want to support multiple images.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We were short of debug image files on macOS and that was because we were not looking into the right image (only the base image when we needed to look at the full system too). This PR will now look at all the restore images.
At the same time, macOS 13.0 changes the location of the dyld directory as per #5 and we will now select the proper image to extract from based on the
Cryptex1,SystemOSkey in theBuildManifest.plist.