hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-06-21 21:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Handle the places where we could risk that Path.Combine would have thrown away the first argument.

Browse Source
This commit is contained in:
Michael Nebel
2026-06-18 15:29:03 +02:00
parent f7b3f851e8
commit 03b525b689
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
csharp/autobuilder/Semmle.Autobuild.Shared/Project.cs
View File

@@ -108,7 +108,8 @@ namespace Semmle.Autobuild.Shared
}
var includePath = builder.Actions.PathJoin(include.Value.Split('\\', StringSplitOptions.RemoveEmptyEntries));
ret.Add(new Project<TAutobuildOptions>(builder, builder.Actions.PathJoin(DirectoryName, includePath)));
var path = Path.IsPathRooted(includePath) ? includePath : builder.Actions.PathJoin(DirectoryName, includePath);
ret.Add(new Project<TAutobuildOptions>(builder, path));
}
return ret;
});

6
csharp/extractor/Semmle.Extraction.CSharp/Extractor/CsProjFile.cs
View File

@@ -159,7 +159,11 @@ namespace Semmle.Extraction.CSharp
return null;
}
return Path.GetFullPath(Path.Join(projDir?.FullName ?? string.Empty, Path.DirectorySeparatorChar == '/' ? file.Replace("\\", "/") : file));
var normalized = Path.DirectorySeparatorChar == '/' ? file.Replace("\\", "/") : file;
var path = projDir is not null && !Path.IsPathRooted(normalized)
? Path.Join(projDir.FullName, normalized)
: normalized;
return Path.GetFullPath(path);
}
private readonly string[] references;