Repository navigation
Do not ignore ClassLoader::ResolveTokenToTypeDefThrowing return values - #121864
Merged
Merged
Conversation
github-actions
Bot
added
the
needs-area-label
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes improper handling of ClassLoader::ResolveTokenToTypeDefThrowing return values. The function can return FALSE when a token cannot be resolved, and in such cases, the out parameters are not initialized. The fix ensures that calling code checks the return value before using the out parameters.
- Added return value checks in three locations where
ResolveTokenToTypeDefThrowingwas previously called without checking its result - Updated logic to gracefully handle resolution failures with appropriate fallback behavior
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/coreclr/vm/methodtablebuilder.cpp | Added return value check at line 3875 with fallback to ELEMENT_TYPE_VALUETYPE, and wrapped code at line 3914 to only use resolved values when resolution succeeds |
| src/coreclr/vm/method.cpp | Added return value check at line 2318 to prevent use of uninitialized out parameters in IsTypeDefOrRefImplementedInSystemModule |
jkotas
added
area-VM-coreclr
and removed
needs-area-label
Contributor
|
Tagging subscribers to this area: @mangod9 |
jkotas
force-pushed
the
issue-121791
branch
2 times, most recently
from
November 22, 2025 06:31
c5bb40c to
e56b25d
Compare
jkotas
commented
Nov 22, 2025
jkotas
commented
Nov 22, 2025
jkotas
commented
Nov 23, 2025
This was referenced Nov 23, 2025
3 tasks
Member
Author
|
/azp run runtime-nativeaot-outerloop |
|
Azure Pipelines successfully started running 1 pipeline(s). |
ResolveTokenToTypeDefThrowing can return FALSE in some situations when the token cannot be resolved. The calling code has to deal with the situation gracefully since the [out] arguments are not initialized in that case. Fixes dotnet#121791
Member
Author
|
/azp run runtime-nativeaot-outerloop |
|
Azure Pipelines successfully started running 1 pipeline(s). |
jkotas
commented
Nov 25, 2025
jkotas
commented
Nov 25, 2025
jkotas
commented
Nov 25, 2025
jkotas
commented
Nov 25, 2025
AaronRobinsonMSFT
approved these changes
Nov 25, 2025
Member
Author
|
/backport to release/10.0 |
Contributor
|
Started backporting to |
Merged
2 of 4 tasks
Member
Author
|
/ba-g osx infra is down. The change passed CI before. |
jkotas
added a commit
that referenced
this pull request
Dec 4, 2025
…ng return values (#121968) Backport of #121864 to release/10.0 /cc @jkotas ## Customer Impact - [x] Customer reported - [ ] Found internally Customer observed crash in NUnit project after upgrading to .NET 10. The bug is triggered by a static field that: - The type of the field must be a struct type - The struct type lives in external assembly. - The external assembly exists, but the struct type is missing in that assembly. The fix is the add missing error handling in a few places. ## Regression - [x] Yes - [ ] No Regressions introduced by #114675 (runtime async feature) and #118413 (type loading perf work) ## Testing Targeted repro, distilled to a test ## Risk Low. The fix is just an extra error handling. --------- Co-authored-by: Jan Kotas <jkotas@microsoft.com>
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
ResolveTokenToTypeDefThrowing can return FALSE in some situations when the token cannot be resolved. The calling code has to deal with the situation gracefully since the [out] arguments are not initialized in that case.
Regressions introduced by #114675 (method.cpp) and #118413 (methodtablebuilder.cpp)
Fixes #121791