Mercurial > hg
diff rust/hg-core/src/revlog/revlog.rs @ 45595:497657895b54
hg-core: return `Err` on decompression error (D8958#inline-15004 followup)
Differential Revision: https://phab.mercurial-scm.org/D9100
author | Antoine cezar<acezar@chwitlabs.fr> |
---|---|
date | Mon, 28 Sep 2020 14:06:23 +0200 |
parents | 639f33f22faf |
children | 900b9b79b99c |
line wrap: on
line diff
--- a/rust/hg-core/src/revlog/revlog.rs Mon Sep 28 14:01:57 2020 +0200 +++ b/rust/hg-core/src/revlog/revlog.rs Mon Sep 28 14:06:23 2020 +0200 @@ -247,38 +247,45 @@ // Raw revision data follows. b'u' => Ok(Cow::Borrowed(&self.bytes[1..])), // zlib (RFC 1950) data. - b'x' => Ok(Cow::Owned(self.uncompressed_zlib_data())), + b'x' => Ok(Cow::Owned(self.uncompressed_zlib_data()?)), // zstd data. - b'\x28' => Ok(Cow::Owned(self.uncompressed_zstd_data())), + b'\x28' => Ok(Cow::Owned(self.uncompressed_zstd_data()?)), format_type => Err(RevlogError::UnknowDataFormat(format_type)), } } - fn uncompressed_zlib_data(&self) -> Vec<u8> { + fn uncompressed_zlib_data(&self) -> Result<Vec<u8>, RevlogError> { let mut decoder = ZlibDecoder::new(self.bytes); if self.is_delta() { let mut buf = Vec::with_capacity(self.compressed_len); - decoder.read_to_end(&mut buf).expect("corrupted zlib data"); - buf + decoder + .read_to_end(&mut buf) + .or(Err(RevlogError::Corrupted))?; + Ok(buf) } else { let mut buf = vec![0; self.uncompressed_len]; - decoder.read_exact(&mut buf).expect("corrupted zlib data"); - buf + decoder + .read_exact(&mut buf) + .or(Err(RevlogError::Corrupted))?; + Ok(buf) } } - fn uncompressed_zstd_data(&self) -> Vec<u8> { + fn uncompressed_zstd_data(&self) -> Result<Vec<u8>, RevlogError> { if self.is_delta() { let mut buf = Vec::with_capacity(self.compressed_len); zstd::stream::copy_decode(self.bytes, &mut buf) - .expect("corrupted zstd data"); - buf + .or(Err(RevlogError::Corrupted))?; + Ok(buf) } else { let mut buf = vec![0; self.uncompressed_len]; let len = zstd::block::decompress_to_buffer(self.bytes, &mut buf) - .expect("corrupted zstd data"); - assert_eq!(len, self.uncompressed_len, "corrupted zstd data"); - buf + .or(Err(RevlogError::Corrupted))?; + if len != self.uncompressed_len { + Err(RevlogError::Corrupted) + } else { + Ok(buf) + } } }