Remove now unneeded limit check

This commit is contained in:
Jonathan Behrens committed 2022-04-14 21:40:19 -04:00
1 parent 9394f6d043
commit e4eac36c1c
2 files changed
+6 -14

No files matched your search

+5 -13
View File
@@ -1038,7 +1038,6 @@ impl<R: Read + Seek> Decoder<R> {
length, length,
buffer.len(), buffer.len(),
buffer.byte_len(), buffer.byte_len(),
self.limits.intermediate_buffer_size,
)?; )?;
// Read into output buffer. // Read into output buffer.
@@ -1106,7 +1105,6 @@ impl<R: Read + Seek> Decoder<R> {
compressed_length, compressed_length,
tile_samples, tile_samples,
byte_len, byte_len,
self.limits.intermediate_buffer_size,
)?; )?;
for row in 0..(tile_length - padding_down) { for row in 0..(tile_length - padding_down) {
@@ -1151,20 +1149,14 @@ impl<R: Read + Seek> Decoder<R> {
compressed_length: u64, compressed_length: u64,
samples: usize, // Expected chunk length in samples samples: usize, // Expected chunk length in samples
byte_len: usize, // Byte length of the samples in result buffer byte_len: usize, // Byte length of the samples in result buffer
intermediate_buffer_size: usize,
) -> TiffResult<Box<dyn Read + 'r>> { ) -> TiffResult<Box<dyn Read + 'r>> {
Ok(match compression_method { Ok(match compression_method {
CompressionMethod::None => Box::new(reader), CompressionMethod::None => Box::new(reader),
CompressionMethod::LZW => { CompressionMethod::LZW => Box::new(LZWReader::new(
let clen = usize::try_from(compressed_length)?; reader,
usize::try_from(compressed_length)?,
if samples * byte_len > intermediate_buffer_size || clen > intermediate_buffer_size samples * byte_len,
{ )),
return Err(TiffError::LimitsExceeded);
}
Box::new(LZWReader::new(reader, clen, samples * byte_len))
}
CompressionMethod::PackBits => { CompressionMethod::PackBits => {
Box::new(PackBitsReader::new(reader, usize::try_from(compressed_length)?)?.1) Box::new(PackBitsReader::new(reader, usize::try_from(compressed_length)?)?.1)
} }
+1 -1
View File
@@ -409,7 +409,7 @@ fn oom_2() {
let err = decoder.read_image().unwrap_err(); let err = decoder.read_image().unwrap_err();
match err { match err {
tiff::TiffError::LimitsExceeded => {} tiff::TiffError::IoError(_) => {}
unexpected => panic!("Unexpected error {}", unexpected), unexpected => panic!("Unexpected error {}", unexpected),
} }
} }