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

Bug fix: abort file if switch_to fails

Browse source
This commit is contained in:
Chris Hennick 2023-05-04 11:12:01 -07:00
parent a41c92d164
commit 26bf30fc25
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/write.rs
View file

@ -501,13 +501,13 @@ impl<W: Write + Seek> ZipWriter<W> {
pub fn abort_file(&mut self) -> ZipResult<()> { pub fn abort_file(&mut self) -> ZipResult<()> {
let last_file = self.files.pop().ok_or(ZipError::FileNotFound)?; let last_file = self.files.pop().ok_or(ZipError::FileNotFound)?;
self.files_by_name.remove(&last_file.file_name); self.files_by_name.remove(&last_file.file_name);
self.inner
.get_plain()
.seek(SeekFrom::Start(last_file.header_start))?;
let make_plain_writer = self let make_plain_writer = self
.inner .inner
.prepare_next_writer(CompressionMethod::Stored, None)?; .prepare_next_writer(CompressionMethod::Stored, None)?;
self.inner.switch_to(make_plain_writer)?; self.inner.switch_to(make_plain_writer)?;
self.inner
.get_plain()
.seek(SeekFrom::Start(last_file.header_start))?;
self.writing_to_file = false; self.writing_to_file = false;
self.writing_raw = false; self.writing_raw = false;
Ok(()) Ok(())
@ -526,7 +526,10 @@ impl<W: Write + Seek> ZipWriter<W> {
.inner .inner
.prepare_next_writer(options.compression_method, options.compression_level)?; .prepare_next_writer(options.compression_method, options.compression_level)?;
self.start_entry(name, options, None)?; self.start_entry(name, options, None)?;
self.inner.switch_to(make_new_self)?; if let Err(e) = self.inner.switch_to(make_new_self) {
let _ = self.abort_file();
return Err(e);
}
self.writing_to_file = true; self.writing_to_file = true;
Ok(()) Ok(())
} }