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
6 changes: 5 additions & 1 deletion crates/xtask/src/xtask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,8 @@ fn vendor_denied_crate(path: &Utf8Path) -> Option<&'static str> {
/// [`VENDOR_DENYLIST`].
fn vendor_denied_entries(archive: impl std::io::Read) -> Result<Vec<String>> {
let mut denied = Vec::new();
for entry in tar::Archive::new(archive).entries()? {
let mut archive = tar::Archive::new(archive);
for entry in archive.entries()? {
let entry = entry?;
let path = entry.path()?;
let path = path.to_string_lossy();
Expand All @@ -542,6 +543,9 @@ fn vendor_denied_entries(archive: impl std::io::Read) -> Result<Vec<String>> {
denied.push(format!("{path} (from {name})"));
}
}
// Drain trailing padding after the end-of-archive marker so the
// writer (zstd) doesn't get SIGPIPE.
std::io::copy(&mut archive.into_inner(), &mut std::io::sink())?;
Ok(denied)
}

Expand Down
Loading