diff --git a/libs/flatipc/src/string.rs b/libs/flatipc/src/string.rs index c43d64a4a..d5e04f111 100644 --- a/libs/flatipc/src/string.rs +++ b/libs/flatipc/src/string.rs @@ -23,6 +23,7 @@ impl From<&str> for String { impl core::fmt::Write for String { fn write_str(&mut self, s: &str) -> core::fmt::Result { + assert!(self.length <= self.buffer.len()); if s.len() + self.length > N { return Err(core::fmt::Error); } @@ -52,7 +53,7 @@ impl core::fmt::Display for String { impl AsRef for String { fn as_ref(&self) -> &str { - // Safe because we guarantee the buffer is valid UTF-8 - unsafe { core::str::from_utf8_unchecked(&self.buffer[0..self.length]) } + assert!(self.length <= self.buffer.len()); + core::str::from_utf8(&self.buffer[0..self.length]).unwrap() } } diff --git a/libs/flatipc/src/vec.rs b/libs/flatipc/src/vec.rs index 5fd96cc26..494fd9e11 100644 --- a/libs/flatipc/src/vec.rs +++ b/libs/flatipc/src/vec.rs @@ -21,6 +21,7 @@ impl Vec { } pub fn pop(&mut self) -> Option { + assert!(self.length <= self.buffer.len()); if self.length > 0 { self.length -= 1; unsafe { Some(self.buffer[self.length].as_ptr().read()) } @@ -29,17 +30,23 @@ impl Vec { } } - pub fn len(&self) -> usize { self.length } + pub fn len(&self) -> usize { + assert!(self.length <= self.buffer.len()); + self.length + } pub fn as_slice(&self) -> &[T] { + assert!(self.length <= self.buffer.len()); unsafe { core::slice::from_raw_parts(self.buffer.as_ptr() as *const T, self.length) } } pub fn as_mut_slice(&mut self) -> &mut [T] { + assert!(self.length <= self.buffer.len()); unsafe { core::slice::from_raw_parts_mut(self.buffer.as_mut_ptr() as *mut T, self.length) } } pub fn clear(&mut self) { + assert!(self.length <= self.buffer.len()); for i in 0..self.length { unsafe { core::ptr::drop_in_place(&mut self.buffer[i]); @@ -56,6 +63,7 @@ impl Vec { where T: Clone, { + assert!(self.length <= self.buffer.len()); if new_len > self.length { for _ in self.length..new_len { self.push(value.clone());