hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18770 from hvitved/shared/windows-drive-letter-trap-id

Browse Source 
Rust extractors: Normalize drive letter paths with a trailing `/`
This commit is contained in:
Tom Hvitved
2025-02-13 16:24:11 +01:00
committed by GitHub
parent 1cfc8f6abc 02fd23e53a
commit bd9eb7d564
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shared/tree-sitter-extractor/src/file_paths.rs
View File

@@ -8,7 +8,8 @@ pub fn normalize_path(path: &Path) -> String {
// have to do a bit of work removing certain prefixes and replacing
// backslashes.
let mut components: Vec<String> = Vec::new();
for component in path.components() {
let mut path_components = path.components().peekable();
while let Some(component) = path_components.next() {
match component {
std::path::Component::Prefix(prefix) => match prefix.kind() {
std::path::Prefix::Disk(letter) | std::path::Prefix::VerbatimDisk(letter) => {
@@ -26,7 +27,13 @@ pub fn normalize_path(path: &Path) -> String {
std::path::Component::Normal(n) => {
components.push(n.to_string_lossy().to_string());
}
std::path::Component::RootDir => {}
std::path::Component::RootDir => {
if path_components.peek().is_none() {
// The path points at a root directory, so we need to add a
// trailing slash, e.g. `C:/` instead of `C:`.
components.push("".to_string());
}
}
std::path::Component::CurDir => {}
std::path::Component::ParentDir => {}
}