Support PE32+ optional header #84
Merged
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
|
Sorry, CI was broken. Can you rebase it and push again? |
nneonneo
reviewed
Apr 5, 2023
hachoir/parser/program/exe_pe.py
Outdated
| yield UInt8(self, "maj_lnk_ver", "Major linker version") | ||
| yield UInt8(self, "min_lnk_ver", "Minor linker version") | ||
| yield filesizeHandler(UInt32(self, "size_code", "Size of code")) | ||
| yield filesizeHandler(UInt32(self, "size_init_data", "Size of initialized data")) | ||
| yield filesizeHandler(UInt32(self, "size_uninit_data", "Size of uninitialized data")) | ||
| yield textHandler(UInt32(self, "entry_point", "Address (RVA) of the code entry point"), hexadecimal) | ||
| yield textHandler(UInt32(self, "base_code", "Base (RVA) of code"), hexadecimal) | ||
| yield textHandler(UInt32(self, "base_data", "Base (RVA) of data"), hexadecimal) | ||
| yield textHandler(UInt32(self, "image_base", "Image base (RVA)"), hexadecimal) | ||
| if not is_pe32plus: yield textHandler(UInt32(self, "base_data", "Base (RVA) of data"), hexadecimal) |
There was a problem hiding this comment.
use two separate lines here
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.
I'm using hachoir in my project and just recently came across a failure because the
PEexe parser only supports the optionalPE32header, not thePE32+one.Interestingly this is already marked in the code with a TODO, and adding support for it is relatively simple by just following the specification in https://learn.microsoft.com/en-us/windows/win32/debug/pe-format#optional-header-image-only.
I've tested that with these changes applied, the previously failing exe file can now be parsed correctly.