wim/image-tiff
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix possibly overflowing multiplications

Browse Source
This commit is contained in:
Birk Tjelmeland committed 2019-03-12 11:07:57 +01:00
1 parent 1871f985c0
commit 5e86931dff
2 files changed
+10 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/decoder/ifd.rs
+4 -7
View File
@@ -170,8 +170,7 @@ impl Entry {
]))
},
(Type::SHORT, n) => {
// each value is ~8 bytes
if u64::from(n)*8 > limits.decoding_buffer_size {
if n as usize > limits.decoding_buffer_size / std::mem::size_of::<Value>() {
return Err(TiffError::LimitsExceeded)
}
let mut v = Vec::with_capacity(n as usize);
@@ -183,8 +182,7 @@ impl Entry {
},
(Type::LONG, 1) => Ok(Unsigned(try!(self.r(bo).read_u32()))),
(Type::LONG, n) => {
// each value is ~8 bytes
if u64::from(n)*8 > limits.decoding_buffer_size {
if n as usize > limits.decoding_buffer_size / std::mem::size_of::<Value>() {
return Err(TiffError::LimitsExceeded)
}
let mut v = Vec::with_capacity(n as usize);
@@ -201,8 +199,7 @@ impl Entry {
Ok(Rational(numerator, denominator))
},
(Type::RATIONAL, n) => {
// each value is ~8 bytes
if u64::from(n)*8 > limits.decoding_buffer_size {
if n as usize > limits.decoding_buffer_size / std::mem::size_of::<Value>() {
return Err(TiffError::LimitsExceeded)
}
let mut v = Vec::with_capacity(n as usize);
@@ -215,7 +212,7 @@ impl Entry {
Ok(List(v))
},
(Type::ASCII, n) => {
if u64::from(n) > limits.decoding_buffer_size {
if n as usize > limits.decoding_buffer_size {
return Err(TiffError::LimitsExceeded)
}
try!(decoder.goto_offset(try!(self.r(bo).read_u32())));