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

fix: finish_into_readable() would corrupt the archive if the central directory had moved

Browse source
This commit is contained in:
Chris Hennick 2024-06-08 14:27:28 -07:00
parent 5bb31e3558
commit f3bb677511
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/write.rs
View file

@ -268,7 +268,7 @@ pub struct ExtendedFileOptions {
impl Debug for ExtendedFileOptions { impl Debug for ExtendedFileOptions {
fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> { fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
f.write_fmt(format_args!("ExtendedFileptions {{extra_data: vec!{:?}.into(), central_extra_data: vec!{:?}.into()}}", f.write_fmt(format_args!("ExtendedFileOptions {{extra_data: vec!{:?}.into(), central_extra_data: vec!{:?}.into()}}",
self.extra_data, self.central_extra_data)) self.extra_data, self.central_extra_data))
} }
} }
@ -1386,7 +1386,7 @@ impl<W: Write + Seek> ZipWriter<W> {
self.finish_file()?; self.finish_file()?;
let central_start = { let central_start = {
let central_start = self.write_central_and_footer()?; let mut central_start = self.write_central_and_footer()?;
let writer = self.inner.get_plain(); let writer = self.inner.get_plain();
let footer_end = writer.stream_position()?; let footer_end = writer.stream_position()?;
let file_end = writer.seek(SeekFrom::End(0))?; let file_end = writer.seek(SeekFrom::End(0))?;
@ -1395,7 +1395,7 @@ impl<W: Write + Seek> ZipWriter<W> {
// the actual end. // the actual end.
let central_and_footer_size = footer_end - central_start; let central_and_footer_size = footer_end - central_start;
writer.seek(SeekFrom::End(-(central_and_footer_size as i64)))?; writer.seek(SeekFrom::End(-(central_and_footer_size as i64)))?;
self.write_central_and_footer()?; central_start = self.write_central_and_footer()?;
} }
central_start central_start
}; };