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.

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

Harden metadata handler invoker against bad metadata #47433

Merged
merged 3 commits into from
Mar 20, 2025
Merged

Harden metadata handler invoker against bad metadata #47433

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8b35a1
Harden metadata handler invoker against bad metadata
tmat Mar 11, 2025
d991e9a
Use case insensitive comparer for assembly name comparison
tmat Mar 18, 2025
dba9515
Handle null Name
tmat Mar 19, 2025
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
41 changes: 36 additions & 5 deletions src/BuiltInTools/HotReloadAgent/MetadataUpdateHandlerInvoker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ internal static List<Assembly> TopologicalSort(Assembly[] assemblies)
{
var sortedAssemblies = new List<Assembly>(assemblies.Length);

var visited = new HashSet<string>(StringComparer.Ordinal);
var visited = new HashSet<string>(StringComparer.OrdinalIgnoreCase);

foreach (var assembly in assemblies)
{
Expand All @@ -327,15 +327,46 @@ internal static List<Assembly> TopologicalSort(Assembly[] assemblies)

static void Visit(Assembly[] assemblies, Assembly assembly, List<Assembly> sortedAssemblies, HashSet<string> visited)
{
var assemblyIdentifier = assembly.GetName().Name!;
if (!visited.Add(assemblyIdentifier))
string assemblyIdentifier;

try
{
assemblyIdentifier = assembly.GetName().Name;
}
catch
{
return;
}

if (assemblyIdentifier == null || !visited.Add(assemblyIdentifier))
{
return;
}

foreach (var dependencyName in assembly.GetReferencedAssemblies())
AssemblyName[] referencedAssemblies;
try
{
var dependency = Array.Find(assemblies, a => a.GetName().Name == dependencyName.Name);
referencedAssemblies = assembly.GetReferencedAssemblies();
}
catch
{
referencedAssemblies = [];
}

foreach (var dependencyName in referencedAssemblies)
{
var dependency = Array.Find(assemblies, a =>
{
try
{
return string.Equals(a.GetName().Name, dependencyName.Name, StringComparison.OrdinalIgnoreCase);
}
catch
{
return false;
}
});

if (dependency is not null)
{
Visit(assemblies, dependency, sortedAssemblies, visited);
Expand Down
Loading