From f04e4f4a04db13776ac2421bf814fa4f72f9b402 Mon Sep 17 00:00:00 2001 From: Zac Pullar-Strecker Date: Tue, 16 Jun 2020 14:31:55 +1200 Subject: [PATCH] Changes from review --- src/read.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/read.rs b/src/read.rs index e7d3d706..7d6115a9 100644 --- a/src/read.rs +++ b/src/read.rs @@ -241,18 +241,14 @@ impl ZipArchive { /// # Platform-specific behaviour /// /// On unix systems permissions from the zip file are preserved, if they exist. - pub fn extract(&mut self, directory: &Path) -> ZipResult<()> { + pub fn extract(&mut self, directory: &dyn AsRef) -> ZipResult<()> { for i in 0..self.len() { let mut file = self.by_index(i)?; let filepath = file.sanitized_name(); - // `sanitized_name` should return a relative path - // otherwise there's a risk of directory traversal attacks - assert!(filepath.is_relative()); + let outpath = directory.as_ref().join(filepath); - let outpath = directory.join(filepath); - - if (&*file.name()).ends_with('/') { + if (file.name()).ends_with('/') { fs::create_dir_all(&outpath)?; } else { if let Some(p) = outpath.parent() {