Fix ILVerify.ILVerifyTypeSystemContext.VerifyModuleName throws NullReferenceException (#63222)

masonwheeler · web-flow · commit d0631be3a1b9 · 2021-12-30T11:07:48.000-08:00
Fixes #62711
diff --git a/src/coreclr/tools/ILVerification/ILVerifyTypeSystemContext.cs b/src/coreclr/tools/ILVerification/ILVerifyTypeSystemContext.cs
@@ -53,9 +53,11 @@ internal override ModuleDesc ResolveModule(IAssemblyDesc referencingModule, stri
         private EcmaModule ResolveAssemblyOrNetmodule(string simpleName, string verificationName, IAssemblyDesc containingAssembly, bool throwIfNotFound)
         {
             PEReader peReader = _resolver.Resolve(simpleName);
-            if (peReader == null && throwIfNotFound)
+            if (peReader == null)
             {
-                throw new VerifierException("Assembly or module not found: " + simpleName);
+                if (throwIfNotFound)
+                    throw new VerifierException("Assembly or module not found: " + simpleName);
+                return null;
             }
             var module = GetModule(peReader, containingAssembly);
             VerifyModuleName(verificationName, module);

Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,11 @@ internal override ModuleDesc ResolveModule(IAssemblyDesc referencingModule, stri`
`53`	`53`	`private EcmaModule ResolveAssemblyOrNetmodule(string simpleName, string verificationName, IAssemblyDesc containingAssembly, bool throwIfNotFound)`
`54`	`54`	`{`
`55`	`55`	`PEReader peReader = _resolver.Resolve(simpleName);`
`56`		`- if (peReader == null && throwIfNotFound)`
	`56`	`+ if (peReader == null)`
`57`	`57`	`{`
`58`		`- throw new VerifierException("Assembly or module not found: " + simpleName);`
	`58`	`+ if (throwIfNotFound)`
	`59`	`+ throw new VerifierException("Assembly or module not found: " + simpleName);`
	`60`	`+ return null;`
`59`	`61`	`}`
`60`	`62`	`var module = GetModule(peReader, containingAssembly);`
`61`	`63`	`VerifyModuleName(verificationName, module);`