Fix fast patching potentially corrupting EH catch type in memory #747
Merged
Conversation
Owner
|
Thanks for the catch and the fix. Could you add your repro as a unit test? |
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.
When fast patching method bodies, the EH catch type token is rewritten directly into the original raw body's section data
AsmResolver/src/AsmResolver.DotNet/Code/Cil/CilMethodBodySerializer.cs
Lines 188 to 199 in 08fa5cd
Since
sectionDatais ultimately owned by thesourceBody.OriginalRawBody, patching the catch type token in place mutates the original body itself in memory. So for example if you write a module twice, the first module will be fine while the second module may have the wrong token for the catch type.repro case:
To fix it, I just Clone the sectionData before patching it.