Skip to content
Merged
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions src/PerfView/SymbolReaderHttpHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -436,14 +436,28 @@ private static string GetFileOnEnvironmentPath(string fileName)
{
foreach (string folder in Environment.GetEnvironmentVariable("PATH").Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
{
string path = Path.Combine(folder, fileName);
if (File.Exists(path))
if (TryCombinePaths(folder, fileName, out var path) && File.Exists(path))
{
return path;
}
}

return null;

// PATH environment variable may contain invalid paths/characters.
static bool TryCombinePaths(string path1, string path2, out string result)
{
try
{
result = Path.Combine(path1, path2);
return true;
}
catch (ArgumentException)
{
result = default;
return false;
}
}
}

/// <summary>
Expand Down