From 710695219fb533a9998babbc859e5163ece37fe7 Mon Sep 17 00:00:00 2001 From: Chris Hennick Date: Sun, 21 May 2023 12:16:48 -0700 Subject: [PATCH] Bug fix: disable file encryption in abort_file --- src/write.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/write.rs b/src/write.rs index 5557c185..74f3b11a 100644 --- a/src/write.rs +++ b/src/write.rs @@ -713,6 +713,7 @@ impl ZipWriter { .inner .prepare_next_writer(CompressionMethod::Stored, None)?; self.inner.switch_to(make_plain_writer)?; + self.switch_to_non_encrypting_writer()?; // Make sure this is the last file, and that no shallow copies of it remain; otherwise we'd // overwrite a valid file and corrupt the archive @@ -1803,8 +1804,23 @@ mod test { assert_eq!(RT_TEST_TEXT.as_bytes(), contents); Ok(()) } + + #[test] + fn remove_encrypted_file() -> ZipResult<()> { + let mut writer = ZipWriter::new(io::Cursor::new(Vec::new())); + let first_file_options = FileOptions::default() + .with_alignment(65535) + .with_deprecated_encryption(b"Password"); + writer.start_file("", first_file_options).unwrap(); + writer.abort_file().unwrap(); + let zip = writer.finish().unwrap(); + let mut writer = ZipWriter::new(zip); + writer.start_file("", FileOptions::default()).unwrap(); + Ok(()) + } } + #[cfg(not(feature = "unreserved"))] const EXTRA_FIELD_MAPPING: [u16; 49] = [ 0x0001, 0x0007, 0x0008, 0x0009, 0x000a, 0x000c, 0x000d, 0x000e, 0x000f, 0x0014, 0x0015, 0x0016,