Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/6.0] Adding null check to avoid abort when invalid IL is encountered #57731

Merged
merged 3 commits into from
Aug 19, 2021

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 19, 2021

Backport of #57522 to release/6.0

/cc @akoeplinger @bholmes

Customer Impact

When a callvirt instruction is encountered on a static method, there is a hard abort/crash. This commit avoids the problem.

Testing

Tested with sample program in #57522 (comment)

Risk

Minimal, it just adds a null check.

github-actions bot and others added 3 commits August 18, 2021 15:36
Co-authored-by: Stephen Toub <stoub@microsoft.com>
Co-authored-by: Natalia Kondratyeva <knatalia@microsoft.com>
When a callvirt instruction is encountered on a static method, there is
a hard abort/crash. This commit avoids the problem.
@akoeplinger
Copy link
Member

cc @marek-safar for M2 approval

Copy link
Member

@jeffschwMSFT jeffschwMSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved. Please ensure this change is also in release/6.0 (or it will regress when we ship RC2).

@akoeplinger akoeplinger changed the base branch from release/6.0-rc1 to release/6.0 August 19, 2021 17:01
@akoeplinger akoeplinger changed the title [release/6.0-rc1] Adding null check to avoid abort when invalid IL is encountered [release/6.0] Adding null check to avoid abort when invalid IL is encountered Aug 19, 2021
@akoeplinger
Copy link
Member

This isn't critical for rc1 so I retargeted to release/6.0 for RC2.

@akoeplinger akoeplinger merged commit a06a1f4 into release/6.0 Aug 19, 2021
@akoeplinger akoeplinger deleted the backport/pr-57522-to-release/6.0-rc1 branch August 19, 2021 17:03
@ghost ghost locked as resolved and limited conversation to collaborators Sep 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants