DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: allow non-utf8 comments in ZipWriter

Browse source
This commit is contained in:
Marli Frost 2021-04-19 11:58:45 +01:00
parent 32b2f5b483
commit 44352aa34b
No known key found for this signature in database
GPG key ID: CB0BEA7CF9BD1245
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/write.rs
View file

@ -68,7 +68,7 @@ pub struct ZipWriter<W: Write + io::Seek> {
files: Vec<ZipFileData>, files: Vec<ZipFileData>,
stats: ZipWriterStats, stats: ZipWriterStats,
writing_to_file: bool, writing_to_file: bool,
comment: String, comment: Vec<u8>,
writing_raw: bool, writing_raw: bool,
} }
@ -225,7 +225,7 @@ impl<A: Read + Write + io::Seek> ZipWriter<A> {
files, files,
stats: Default::default(), stats: Default::default(),
writing_to_file: false, writing_to_file: false,
comment: String::new(), comment: footer.zip_file_comment,
writing_raw: true, // avoid recomputing the last file's header writing_raw: true, // avoid recomputing the last file's header
}) })
} }
@ -241,7 +241,7 @@ impl<W: Write + io::Seek> ZipWriter<W> {
files: Vec::new(), files: Vec::new(),
stats: Default::default(), stats: Default::default(),
writing_to_file: false, writing_to_file: false,
comment: String::new(), comment: Vec::new(),
writing_raw: false, writing_raw: false,
} }
} }
@ -251,7 +251,15 @@ impl<W: Write + io::Seek> ZipWriter<W> {
where where
S: Into<String>, S: Into<String>,
{ {
self.comment = comment.into(); self.set_raw_comment(comment.into().into())
}
/// Set ZIP archive comment.
///
/// This sets the raw bytes of the comment. The comment
/// is typically expected to be encoded in UTF-8
pub fn set_raw_comment(&mut self, comment: Vec<u8>) {
self.comment = comment;
} }
/// Start a new file for with the requested options. /// Start a new file for with the requested options.
@ -522,7 +530,7 @@ impl<W: Write + io::Seek> ZipWriter<W> {
number_of_files: self.files.len() as u16, number_of_files: self.files.len() as u16,
central_directory_size: central_size as u32, central_directory_size: central_size as u32,
central_directory_offset: central_start as u32, central_directory_offset: central_start as u32,
zip_file_comment: self.comment.as_bytes().to_vec(), zip_file_comment: self.comment.clone(),
}; };
footer.write(writer)?; footer.write(writer)?;