Preserve BaseOfData when rewriting PE32 images - #4
Open
zanieb wants to merge 1 commit into
Open
Conversation
There was a problem hiding this comment.
Pull request overview
This pull request fixes PE32 image rewriting by ensuring the 4-byte BaseOfData field (present in PE32, absent in PE32+) is preserved during serialization so subsequent optional-header fields are not shifted and corrupted.
Changes:
- Preserve the original
BaseOfDatabytes when rewriting PE32 optional headers. - Add a regression test that rebuilds a PE32 image and asserts byte-size stability and parse/equality round-trips.
Reviewed changes
Copilot reviewed 2 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| tests/tests.rs | Adds a PE32-specific rebuild test using a 32-bit fixture to prevent header-shift regressions. |
| src/image.rs | Copies the on-disk BaseOfData bytes into the rebuilt header for PE32 images before serializing the rest of the optional header. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
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.
The PE specification defines
BaseOfDataas a four-byte field present in PE32 but absent from PE32+. Rebuilding a PE32 executable currently drops this field, shifting subsequent headers and corrupting the image. Instead, we should preserve the existingBaseOfDatabytes when serializing PE32 headers.