mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linkchecker: fix panic on directory symlinks

Browse Source 
In Debian and Ubuntu, there are some patches that change the rustc/fonts
directory to a symlink to the system fonts. This triggers a latent bug
in linkchecker, as the DirEntry filetype isn't a dir but later on the
file itself, when opened, is one, triggering an unreachable!() clause.

This patch fixes the situation by using std::fs::metadata, which goes
through symlinks.

I'd have added a test case but `tidy` doesn't seem to like symlinks, and
moreover I'm not sure how Git deals with symlinks on Windows.

Signed-off-by: Simon Chopin <simon.chopin@canonical.com>
This commit is contained in:
Simon Chopin 2022-02-11 10:20:32 +01:00
parent e273fca380
commit 3a1ffead36
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/linkchecker/main.rs
View File

@ -182,8 +182,9 @@ impl Checker {
fn walk(&mut self, dir: &Path, report: &mut Report) { fn walk(&mut self, dir: &Path, report: &mut Report) {
for entry in t!(dir.read_dir()).map(|e| t!(e)) { for entry in t!(dir.read_dir()).map(|e| t!(e)) {
let path = entry.path(); let path = entry.path();
let kind = t!(entry.file_type()); // Goes through symlinks
if kind.is_dir() { let metadata = t!(fs::metadata(&path));
if metadata.is_dir() {
self.walk(&path, report); self.walk(&path, report);
} else { } else {
self.check(&path, report); self.check(&path, report);