Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Missing null check in TypeSpec.Resolve when asm is null and typeResol… #21617

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.

Sign up for GitHub

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

Open
khaledmousa wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Missing null check in TypeSpec.Resolve when asm is null and typeResol… #21617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions mcs/class/corlib/System/TypeSpec.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,13 @@ internal Type Resolve (Func<AssemblyName,Assembly> assemblyResolver, Func<Assemb
}

Type type = null;
if (typeResolver != null)
if (typeResolver != null) {
type = typeResolver (asm, name.DisplayName, ignoreCase);
else
}
else if(asm != null) {
type = asm.GetType (name.DisplayName, false, ignoreCase);
}

if (type == null) {
if (throwOnError)
throw new TypeLoadException ("Could not resolve type '" + name + "'");
Expand Down
6 changes: 5 additions & 1 deletion mcs/class/corlib/Test/System/TypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4372,7 +4372,11 @@ public void GetTypeWithDelegates () {

// assembly resolve without type resolve
res = Type.GetType ("System.String,mscorlib", delegate (AssemblyName aname) { return typeof (int).Assembly; }, null);
Assert.AreEqual (typeof (string), res);
Assert.AreEqual (typeof (string), res, "#17");

// assembly resolve returning null, and without type resolve
res = Type.GetType ("System.String", delegate (AssemblyName aname) { return null; }, null, false);
Assert.IsNull (res, "#18");
}


Expand Down