Skip to content

Commit

Permalink
Fix resolve_globs crash when at root directory
Browse files Browse the repository at this point in the history
  • Loading branch information
Xetera committed Jan 29, 2025
1 parent f237f59 commit b838b57
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions crates/oxide/src/scanner/detect_sources.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,16 @@ impl DetectSources {
continue;
}

// If we are in a directory where the parent is a forced static directory, then this
// will become a forced static directory as well.
if forced_static_directories.contains(&entry.path().parent().unwrap().to_path_buf())
{
forced_static_directories.push(entry.path().to_path_buf());
root_directories.insert(entry.path().to_path_buf());
continue;
// Although normally very unlikely, if running inside a dockerfile
// the current directory might be "/" with no parent
if let Some(parent) = entry.path().parent() {
// If we are in a directory where the parent is a forced static directory, then this
// will become a forced static directory as well.
if forced_static_directories.contains(&parent.to_path_buf()) {
forced_static_directories.push(entry.path().to_path_buf());
root_directories.insert(entry.path().to_path_buf());
continue;
}
}

// If we are in a directory, and the directory is git ignored, then we don't have to
Expand Down

0 comments on commit b838b57

Please sign in to comment.