Strengthen EpochSlots sanitization
This commit is contained in:
parent
2d62f2ad03
commit
90d557d916
|
@ -24,6 +24,15 @@ impl Sanitize for Uncompressed {
|
|||
if self.num >= MAX_SLOTS_PER_ENTRY {
|
||||
return Err(SanitizeError::ValueOutOfBounds);
|
||||
}
|
||||
if self.slots.len() % 8 != 0 {
|
||||
// Uncompressed::new() ensures the length is always a multiple of 8
|
||||
return Err(SanitizeError::ValueOutOfBounds);
|
||||
}
|
||||
if self.slots.len() != self.slots.capacity() {
|
||||
// A BitVec<u8> with a length that's a multiple of 8 will always have len() equal to
|
||||
// capacity(), assuming no bit manipulation
|
||||
return Err(SanitizeError::ValueOutOfBounds);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
@ -132,7 +141,7 @@ impl Uncompressed {
|
|||
if *s < self.first_slot {
|
||||
return i;
|
||||
}
|
||||
if *s - self.first_slot >= self.slots.capacity() {
|
||||
if *s - self.first_slot >= self.slots.len() {
|
||||
return i;
|
||||
}
|
||||
self.slots.set(*s - self.first_slot, true);
|
||||
|
@ -393,6 +402,14 @@ mod tests {
|
|||
o.num = MAX_SLOTS_PER_ENTRY;
|
||||
assert_eq!(o.sanitize(), Err(SanitizeError::ValueOutOfBounds));
|
||||
|
||||
let mut o = slots.clone();
|
||||
o.slots = BitVec::new_fill(false, 7); // Length not a multiple of 8
|
||||
assert_eq!(o.sanitize(), Err(SanitizeError::ValueOutOfBounds));
|
||||
|
||||
let mut o = slots.clone();
|
||||
o.slots = BitVec::with_capacity(8); // capacity() not equal to len()
|
||||
assert_eq!(o.sanitize(), Err(SanitizeError::ValueOutOfBounds));
|
||||
|
||||
let compressed = Flate2::deflate(slots).unwrap();
|
||||
assert!(compressed.sanitize().is_ok());
|
||||
|
||||
|
|
Loading…
Reference in New Issue