From d51a4fc1d07deca1ec5349aa11400f6965f20618 Mon Sep 17 00:00:00 2001
From: Johan Andersson <repi@repi.se>
Date: Wed, 20 Jun 2018 01:31:46 +0200
Subject: [PATCH 1/2] Fix file name sanitization for incompatible path
 separators.

Zip files can contain both / and \ as separators regardless of the OS and as we want to return a sanitized PathBuf that only supports the OS separator on the let's convert incompatible separators to compatible ones.

If one doesn't do this then PathBufs will be returned that can have entire paths in the file name such as "src\\lib.rs" on Linux/Mac, instead of srv / lib.rs as 3 separate components.
---
 src/types.rs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index c6b518d5..914494ea 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -63,12 +63,23 @@ pub struct ZipFileData
 
 impl ZipFileData {
     pub fn file_name_sanitized(&self) -> ::std::path::PathBuf {
-        let no_null_filename = match self.file_name.find('\0') {
+        let no_null_filename: String = match self.file_name.find('\0') {
             Some(index) => &self.file_name[0..index],
             None => &self.file_name,
-        };
+        }.to_string();
 
-        ::std::path::Path::new(no_null_filename)
+        // zip files can contain both / and \ as separators regardless of the OS
+        // and as we want to return a sanitized PathBuf that only supports the
+        // OS separator let's convert incompatible separators to compatible ones
+        let separator = ::std::path::MAIN_SEPARATOR;
+        let opposite_separator = match separator {
+            '/' => '\\',
+            '\\' | _ => '/',
+        };
+        let filename =
+            no_null_filename.replace(&opposite_separator.to_string(), &separator.to_string());
+
+        ::std::path::Path::new(&filename)
             .components()
             .filter(|component| match *component {
                 ::std::path::Component::Normal(..) => true,

From 0b222aa95817d5a9ab5bafd557d18c0e971f160a Mon Sep 17 00:00:00 2001
From: Johan Andersson <repi@repi.se>
Date: Wed, 20 Jun 2018 01:38:43 +0200
Subject: [PATCH 2/2] Remove redundant type specification

---
 src/types.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types.rs b/src/types.rs
index 914494ea..a8609b3b 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -63,7 +63,7 @@ pub struct ZipFileData
 
 impl ZipFileData {
     pub fn file_name_sanitized(&self) -> ::std::path::PathBuf {
-        let no_null_filename: String = match self.file_name.find('\0') {
+        let no_null_filename = match self.file_name.find('\0') {
             Some(index) => &self.file_name[0..index],
             None => &self.file_name,
         }.to_string();