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
24 changes: 24 additions & 0 deletions zerompk/src/impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,38 @@ impl<T: ToMessagePack> ToMessagePack for [T] {
impl<'a, T: FromMessagePack<'a>, const N: usize> FromMessagePack<'a> for [T; N] {
#[inline(always)]
fn read<R: Read<'a>>(reader: &mut R) -> crate::Result<Self> {
struct InitializedGuard<T> {
ptr: *mut T,
initialized: usize,
}

impl<T> Drop for InitializedGuard<T> {
fn drop(&mut self) {
// SAFETY: the first `initialized` elements were written
// exactly once, and the backing array still exists.
unsafe {
core::ptr::drop_in_place(core::ptr::slice_from_raw_parts_mut(
self.ptr,
self.initialized,
));
}
}
}

reader.check_array_len(N)?;
let mut arr: core::mem::MaybeUninit<[T; N]> = core::mem::MaybeUninit::uninit();
let ptr = arr.as_mut_ptr() as *mut T;
let mut guard = InitializedGuard {
ptr,
initialized: 0,
};
for i in 0..N {
unsafe {
ptr.add(i).write(T::read(reader)?);
}
guard.initialized += 1;
}
core::mem::forget(guard);
Ok(unsafe { arr.assume_init() })
}
}
Expand Down
10 changes: 10 additions & 0 deletions zerompk/tests/deserialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -515,3 +515,13 @@ fn test_vec_drops_initialized_elements_on_decode_error() {
assert!(error.is_err());
assert_eq!(PARTIAL_ARRAY_DROPS.load(Ordering::Relaxed), 1);
}

#[test]
fn test_fixed_array_drops_initialized_elements_on_decode_error() {
PARTIAL_ARRAY_DROPS.store(0, Ordering::Relaxed);

let error = zerompk::from_msgpack::<[DropTracked; 2]>(&[0x92, 0x01, 0xc1]);

assert!(error.is_err());
assert_eq!(PARTIAL_ARRAY_DROPS.load(Ordering::Relaxed), 1);
}