Merge pull request #167 from Shnatsel/master

Enforce decompressed size limits

Author: johannesvollmer

Cargo.lock

@@ -29,7 +29,7 @@ proc-macro = false
 lebe = "^0.5.2"                # generic binary serialization
 half = "^1.8.2"                # 16 bit float pixel data type
 bit_field = "^0.10.1"          # exr file version bit flags
-miniz_oxide = "^0.5.3"         # zip compression for pxr24
+miniz_oxide = "^0.5.4"         # zip compression for pxr24
 smallvec = "^1.7.0"            # make cache-friendly allocations        TODO profile if smallvec is really an improvement!
 threadpool = "^1.8.1"          # threading for parallel compression     TODO make this an optional feature?
 flume = "^0.10.9"              # crossbeam, but less unsafe code        TODO make this an optional feature?

Cargo.toml

@@ -146,8 +146,7 @@ pub fn decompress(channels: &ChannelList, bytes: ByteVec, area: IntegerBounds, e
     }
 
     let raw = miniz_oxide::inflate
-        // TODO ::decompress_to_vec_zlib_with_limit(bytes, expected_byte_size)
-        ::decompress_to_vec_zlib(&bytes)
+        ::decompress_to_vec_zlib_with_limit(&bytes, expected_byte_size)
         .map_err(|_| Error::invalid("zlib-compressed data malformed"))?; // TODO share code with zip?
 
     let mut read = raw.as_slice();

src/compression/pxr24.rs

@@ -16,12 +16,11 @@ pub fn decompress_bytes(
     channels: &ChannelList,
     data: ByteVec,
     rectangle: IntegerBounds,
-    _expected_byte_size: usize,
+    expected_byte_size: usize,
     _pedantic: bool,
 ) -> Result<ByteVec> {
     let mut decompressed = miniz_oxide::inflate
-    // TODO ::decompress_to_vec_zlib_with_limit(data, expected_byte_size)
-    ::decompress_to_vec_zlib(&data)
+    ::decompress_to_vec_zlib_with_limit(&data, expected_byte_size)
         .map_err(|_| Error::invalid("zlib-compressed data malformed"))?;
 
     differences_to_samples(&mut decompressed);