Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/base_vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ impl<T: Storable, M: Memory> BaseVec<T, M> {
assert!(index < self.len());

let offset = DATA_OFFSET + slot_size::<T>() as u64 * index;
let bytes = item.to_bytes();
let bytes = item.to_bytes_checked();
let data_offset = self
.write_entry_size(offset, bytes.len() as u32)
.expect("unreachable: cannot fail to write to pre-allocated area");
Expand All @@ -203,7 +203,7 @@ impl<T: Storable, M: Memory> BaseVec<T, M> {
pub fn push(&self, item: &T) -> Result<(), GrowFailed> {
let index = self.len();
let offset = DATA_OFFSET + slot_size::<T>() as u64 * index;
let bytes = item.to_bytes();
let bytes = item.to_bytes_checked();
let data_offset = self.write_entry_size(offset, bytes.len() as u32)?;
safe_write(&self.memory, data_offset, bytes.borrow())?;
// NB. We update the size only after we ensure that the data
Expand Down
38 changes: 38 additions & 0 deletions src/vec/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -228,3 +228,41 @@ fn test_iter() {
assert_eq!(sv.iter().skip(4).count(), 0);
assert_eq!(sv.iter().skip(usize::MAX).count(), 0);
}

// A struct with a bugg implementation of storable where the max_size can
// smaller than the serialized size.
#[derive(Clone, Ord, PartialOrd, Eq, PartialEq)]
struct BuggyStruct(Vec<u8>);
impl crate::Storable for BuggyStruct {
fn to_bytes(&self) -> Cow<[u8]> {
Cow::Borrowed(&self.0)
}

fn from_bytes(_: Cow<[u8]>) -> Self {
unimplemented!();
}

const BOUND: Bound = Bound::Bounded {
max_size: 1,
is_fixed_size: false,
};
}

#[test]
#[should_panic(expected = "expected an element with length <= 1 bytes, but found 4")]
fn push_element_bigger_than_max_size_panics() {
let sv = StableVec::<BuggyStruct, M>::new(M::default()).unwrap();
// Insert a struct where the serialized size is > `MAX_SIZE`. Should panic.
sv.push(&BuggyStruct(vec![1, 2, 3, 4])).unwrap();
}

#[test]
#[should_panic(expected = "expected an element with length <= 1 bytes, but found 5")]
fn set_element_bigger_than_max_size_panics() {
let sv = StableVec::<BuggyStruct, M>::new(M::default()).unwrap();
// Insert a struct where the serialized size is <= `MAX_SIZE`. This should succeed.
sv.push(&BuggyStruct(vec![1])).unwrap();

// Insert a struct where the serialized size is > `MAX_SIZE`. Should panic.
sv.set(0, &BuggyStruct(vec![1, 2, 3, 4, 5]));
}