chore: Fix build

zip-rs · Jun 18, 2024 · 19118f4 · 19118f4
1 parent cb2d7ab
commit 19118f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/read.rs b/src/read.rs
@@ -810,13 +810,13 @@ impl<R: Read + Seek> ZipArchive<R> {
     ///
     /// This uses the central directory record of the ZIP file, and ignores local file headers.
     pub fn with_config(config: Config, mut reader: R) -> ZipResult<ZipArchive<R>> {
-        let results = spec::Zip32CentralDirectoryEnd::find_and_parse(&mut reader)?;
-        for (footer, cde_start_pos) in results {
-            if let Ok(shared) = Self::get_metadata(config, &mut reader, &footer, cde_start_pos) {
+        let mut results = spec::Zip32CentralDirectoryEnd::find_and_parse(&mut reader)?;
+        for (footer, cde_start_pos) in results.iter_mut() {
+            if let Ok(shared) = Self::get_metadata(config, &mut reader, &footer, *cde_start_pos) {
                 return Ok(ZipArchive {
                     reader,
                     shared: shared.into(),
-                    comment: footer.zip_file_comment.into(),
+                    comment: Arc::from(mem::replace(&mut footer.zip_file_comment, Box::new([]))),
                 });
             }
         }

diff --git a/src/write.rs b/src/write.rs
@@ -625,17 +625,17 @@ impl<A: Read + Write + Seek> ZipWriter<A> {
     ///
     /// This uses the given read configuration to initially read the archive.
     pub fn new_append_with_config(config: Config, mut readwriter: A) -> ZipResult<ZipWriter<A>> {
-        let results = spec::Zip32CentralDirectoryEnd::find_and_parse(&mut readwriter)?;
-        for (footer, cde_start_pos) in results {
+        let mut results = spec::Zip32CentralDirectoryEnd::find_and_parse(&mut readwriter)?;
+        for (footer, cde_start_pos) in results.iter_mut() {
             if let Ok(metadata) =
-                ZipArchive::get_metadata(config, &mut readwriter, &footer, cde_start_pos)
+                ZipArchive::get_metadata(config, &mut readwriter, &footer, *cde_start_pos)
             {
                 return Ok(ZipWriter {
                     inner: Storer(MaybeEncrypted::Unencrypted(readwriter)),
                     files: metadata.files,
                     stats: Default::default(),
                     writing_to_file: false,
-                    comment: footer.zip_file_comment,
+                    comment: mem::replace(&mut footer.zip_file_comment, Box::new([])),
                     writing_raw: true, // avoid recomputing the last file's header
                     flush_on_finish_file: false,
                 });