Fix string errors

1 files changed, 4 insertions, 2 deletions

diff --git a/src/zip/driver.rs b/src/zip/driver.rs
index c9a5155..8662623 100644
--- a/src/zip/driver.rs
+++ b/src/zip/driver.rs
@@ -97,11 +97,13 @@ impl<IO: Read + Seek> ArchiveRead for Zip<IO> {
             p += 4;
             let cdr: CDR = deserialize(&buf[p..p + 42]).unwrap();
             p += 42;
-            let name = String::from_utf8(buf[p..p + cdr.name_len as usize].into()).unwrap();
+            let name = String::from_utf8(buf[p..p + cdr.name_len as usize].into())
+                .map_err(|_| ZipError::InvalidFileName)?;
             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()).unwrap();
+            let comment = String::from_utf8(buf[p..p + cdr.comment_len as usize].into())
+                .map_err(|_| ZipError::InvalidFileComment)?;
             p += cdr.comment_len as usize;
 
             let mut compressed_size = cdr.compressed_size as u64;