mirror
/
ros_pointcloud2
mirror of https://github.com/stelzo/ros_pointcloud2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix UB in direct copy

This commit is contained in:
stelzo 2024-05-24 16:11:32 +02:00
parent 8b26fb6d72
commit 09d3bef0a8
No known key found for this signature in database
GPG Key ID: FC4EF89052319374
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcl2/src/lib.rs
View File

@ -687,7 +687,7 @@ impl PointCloud2Msg {
let bytes_total = vec.len() * point_step as usize; let bytes_total = vec.len() * point_step as usize;
cloud.data.resize(bytes_total, u8::default()); cloud.data.resize(bytes_total, u8::default());
let raw_data: *mut C = cloud.data.as_ptr() as *mut C; let raw_data: *mut C = cloud.data.as_mut_ptr() as *mut C;
unsafe { unsafe {
core::ptr::copy_nonoverlapping( core::ptr::copy_nonoverlapping(
vec.as_ptr().cast::<u8>(), vec.as_ptr().cast::<u8>(),
@ -1006,10 +1006,10 @@ impl PointData {
#[inline] #[inline]
fn from_buffer(data: &[u8], offset: usize, datatype: FieldDatatype, endian: Endian) -> Self { fn from_buffer(data: &[u8], offset: usize, datatype: FieldDatatype, endian: Endian) -> Self {
debug_assert!(data.len() >= offset + datatype.size()); debug_assert!(data.len() >= offset + datatype.size());
let bytes = [u8::default(); core::mem::size_of::<f64>()]; let mut bytes = [u8::default(); core::mem::size_of::<f64>()];
unsafe { unsafe {
let data_ptr = data.as_ptr().add(offset); let data_ptr = data.as_ptr().add(offset);
let bytes_ptr = bytes.as_ptr() as *mut u8; let bytes_ptr = bytes.as_mut_ptr() as *mut u8;
core::ptr::copy_nonoverlapping(data_ptr, bytes_ptr, datatype.size()); core::ptr::copy_nonoverlapping(data_ptr, bytes_ptr, datatype.size());
} }