Fix dex module inconsistencies #2069
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
|
I'm not sure what the macosx build issue is. It complains about missing libjansson, which is not related to the dex module but to the cuckoo one, which i do not touch. So afaict it is unrelated. |
Several bytestring values in the dex module were not set properly, and were cut short due to the presence of a nul byte. This happened on: - all the dex.DEX_FILE_MAGIC_* constants, which were cut short by one byte (the last one is the nul byte). - the magic and signature field in the "header" object of the module. For all of those, the size is fixed and known, so use the right length and do not cut it short if a nul byte is present.
There was some mismatch between the declared fields and the ones filled by the module: - `dex.field[*].static` and `dex.field[*].instance` were defined, but not declared, making their use impossible. They are now properly declared. - several fields in `dex.method[*].code_item` were declared but never defined: `padding`, `tries` and `handlers`. Those are removed since they couldn't have been used.
vthib
force-pushed
the
fix-dex-module-inconsistencies
branch
from
42f7aa1 to
cff2fcd
Compare
plusvic
approved these changes
May 2, 2024
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.
Fix several inconsistencies in the dex module:
some bytestring values were not properly set: the magic constants,
header.magicandheader.signature. Those were cut if a nul byte was present (which is the case in the magic valuesdex.field[*].staticanddex.field[*].instancewere defined, but not declared, making their use impossible. They are now properly declared.several fields in
dex.method[*].code_itemwere declared but never defined:padding,triesandhandlers. Those are removed since they couldn't have been used.