Check for OOM when creating LZWReader
This commit is contained in:
1 parent
a15d619471
commit
5b7814c994
2 files changed
+32
-8
No files matched your search
+13
-8
@@ -1116,6 +1116,7 @@ impl<R: Read + Seek> Decoder<R> {
|
||||
length,
|
||||
buffer.len(),
|
||||
buffer.byte_len(),
|
||||
self.limits.intermediate_buffer_size,
|
||||
)?;
|
||||
|
||||
// Read into output buffer.
|
||||
@@ -1180,6 +1181,7 @@ impl<R: Read + Seek> Decoder<R> {
|
||||
compressed_length,
|
||||
tile_samples,
|
||||
byte_len,
|
||||
self.limits.intermediate_buffer_size,
|
||||
)?;
|
||||
|
||||
for row in 0..(tile_length - padding_down) {
|
||||
@@ -1224,17 +1226,20 @@ impl<R: Read + Seek> Decoder<R> {
|
||||
compressed_length: u64,
|
||||
samples: usize, // Expected chunk length in samples
|
||||
byte_len: usize, // Byte length of the samples in result buffer
|
||||
intermediate_buffer_size: usize,
|
||||
) -> TiffResult<Box<dyn Read + 'r>> {
|
||||
Ok(match compression_method {
|
||||
CompressionMethod::None => Box::new(reader),
|
||||
CompressionMethod::LZW => Box::new(
|
||||
LZWReader::new(
|
||||
reader,
|
||||
usize::try_from(compressed_length)?,
|
||||
samples * byte_len,
|
||||
)?
|
||||
.1,
|
||||
),
|
||||
CompressionMethod::LZW => {
|
||||
let clen = usize::try_from(compressed_length)?;
|
||||
|
||||
if samples * byte_len > intermediate_buffer_size || clen > intermediate_buffer_size
|
||||
{
|
||||
return Err(TiffError::LimitsExceeded);
|
||||
}
|
||||
|
||||
Box::new(LZWReader::new(reader, clen, samples * byte_len)?.1)
|
||||
}
|
||||
CompressionMethod::PackBits => {
|
||||
Box::new(PackBitsReader::new(reader, usize::try_from(compressed_length)?)?.1)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user