Forward name decode failures

Author: cgzones

CHANGES.md

@@ -8,6 +8,8 @@
 * Change to 2021 edition
 * Drop lifetime annotations of reader parameter in `ArchiveIterator::from_read`
   and `ArchiveIterator::from_read_with_encoding` [#90]
+* Forward name decode failures in `ArchiveIterator::from_read` and
+  `ArchiveIterator::from_read_with_encoding` instead of panicking [#91]
 
 ## [0.13.0] - 2022-08-03
 

src/iterator.rs

@@ -269,7 +269,10 @@ impl<R: Read + Seek> ArchiveIterator<R> {
             ffi::ARCHIVE_OK | ffi::ARCHIVE_WARN => {
                 let _utf8_guard = ffi::WindowsUTF8LocaleGuard::new();
                 let cstr = CStr::from_ptr(ffi::archive_entry_pathname(self.archive_entry));
-                let file_name = (self.decode)(cstr.to_bytes()).unwrap();
+                let file_name = match (self.decode)(cstr.to_bytes()) {
+                    Ok(f) => f,
+                    Err(e) => return ArchiveContents::Err(e),
+                };
                 let stat = *ffi::archive_entry_stat(self.archive_entry);
                 ArchiveContents::StartOfEntry(file_name, stat)
             }

tests/integration_test.rs

@@ -4,7 +4,7 @@
 
 use compress_tools::*;
 use std::{
-    io::{Cursor, Read},
+    io::{Cursor, ErrorKind, Read},
     path::Path,
 };
 
@@ -686,3 +686,19 @@ fn uncompress_archive_absolute_path() {
     assert!(correct_dest.exists());
     assert!(!Path::new(incorrect_dest).exists());
 }
+
+#[test]
+fn decode_failure() {
+    let source = std::fs::File::open("tests/fixtures/file.txt.gz").unwrap();
+    let decode_fail = |_bytes: &[u8]| Err(Error::Io(std::io::Error::from(ErrorKind::BrokenPipe)));
+
+    for content in ArchiveIterator::from_read_with_encoding(source, decode_fail).unwrap() {
+        if let ArchiveContents::Err(Error::Io(err)) = content {
+            if err.kind() == ErrorKind::BrokenPipe {
+                return;
+            }
+        }
+    }
+
+    panic!("Did not find expected error");
+}