Avoid possible race with HasLoadError.

siegfriedpammer · siegfriedpammer · commit c67f204fd2f4 · 2021-04-08T15:57:06.000+02:00
diff --git a/ILSpy/AssemblyList.cs b/ILSpy/AssemblyList.cs
@@ -120,13 +120,16 @@ public async Task<IList<LoadedAssembly>> GetAllAssemblies()
 
 			foreach (var asm in assemblies)
 			{
-				if (asm.HasLoadError)
+				LoadedAssembly.LoadResult result;
+				try
+				{
+					result = await asm.GetLoadResultAsync();
+				}
+				catch
 				{
 					results.Add(asm);
 					continue;
 				}
-
-				var result = await asm.GetLoadResultAsync();
 				if (result.Package != null)
 				{
 					AddDescendants(result.Package.RootFolder);

Original file line number	Diff line number	Diff line change
`@@ -120,13 +120,16 @@ public async Task<IList<LoadedAssembly>> GetAllAssemblies()`
`120`	`120`
`121`	`121`	`foreach (var asm in assemblies)`
`122`	`122`	`{`
`123`		`- if (asm.HasLoadError)`
	`123`	`+ LoadedAssembly.LoadResult result;`
	`124`	`+ try`
	`125`	`+ {`
	`126`	`+ result = await asm.GetLoadResultAsync();`
	`127`	`+ }`
	`128`	`+ catch`
`124`	`129`	`{`
`125`	`130`	`results.Add(asm);`
`126`	`131`	`continue;`
`127`	`132`	`}`
`128`		`-`
`129`		`- var result = await asm.GetLoadResultAsync();`
`130`	`133`	`if (result.Package != null)`
`131`	`134`	`{`
`132`	`135`	`AddDescendants(result.Package.RootFolder);`