1 files changed, 16 insertions, 6 deletions

diff --git a/src/zip/driver.rs b/src/zip/driver.rs
index 99b409d..4782e65 100644
--- a/src/zip/driver.rs
+++ b/src/zip/driver.rs
@@ -1,5 +1,6 @@
 use crate::driver::{ArchiveRead, ArchiveWrite, Driver};
 use crate::utils::ReadUtils;
+use crate::zip::cp437::FromCp437;
 use crate::zip::structs::{deserialize, Cdr, Eocdr, Eocdr64, Eocdr64Locator, ExtraHeader};
 use crate::zip::{
     BitFlag, CompressionMethod, ZipError, ZipFileInfo, ZipFileReader, ZipFileWriter, ZipResult,
@@ -77,7 +78,7 @@ impl<Io: Read + Seek> ArchiveRead for Zip<Io> {
         let comment = {
             let mut buf: Vec<u8> = vec![0; eocdr.comment_len as usize];
             io.read(&mut buf)?;
-            String::from_utf8(buf).map_err(|_| ZipError::InvalidArchiveComment)?
+            String::from_cp437(buf)
         };
 
         // Try to find eocdr64locator
@@ -116,14 +117,23 @@ impl<Io: Read + Seek> ArchiveRead for Zip<Io> {
             }
             p += 4;
             let cdr: Cdr = deserialize(&buf[p..p + 42]).unwrap();
+            let bit_flag = BitFlag::new(cdr.bit_flag);
             p += 42;
-            let name = String::from_utf8(buf[p..p + cdr.name_len as usize].into())
-                .map_err(|_| ZipError::InvalidFileName)?;
+            let name = if bit_flag.is_utf8() {
+                String::from_utf8(buf[p..p + cdr.name_len as usize].to_vec())
+                    .map_err(|_| ZipError::InvalidFileName)?
+            } else {
+                String::from_cp437(&buf[p..p + cdr.name_len as usize])
+            };
             p += cdr.name_len as usize;
             let extra_fields: Vec<u8> = buf[p..p + cdr.extra_field_len as usize].into();
             p += cdr.extra_field_len as usize;
-            let comment = String::from_utf8(buf[p..p + cdr.comment_len as usize].into())
-                .map_err(|_| ZipError::InvalidFileComment)?;
+            let comment = if bit_flag.is_utf8() {
+                String::from_utf8(buf[p..p + cdr.comment_len as usize].to_vec())
+                    .map_err(|_| ZipError::InvalidFileComment)?
+            } else {
+                String::from_cp437(&buf[p..p + cdr.comment_len as usize])
+            };
             p += cdr.comment_len as usize;
 
             let mut compressed_size = cdr.compressed_size as u64;
@@ -209,7 +219,7 @@ impl<Io: Read + Seek> ArchiveRead for Zip<Io> {
                 name.clone(),
                 ZipFileInfo::new(
                     CompressionMethod::from_struct_id(cdr.compression_method)?,
-                    BitFlag::new(cdr.bit_flag),
+                    bit_flag,
                     mtime,
                     atime,
                     ctime,