[bevy_core/bytes] Fix UB with accessing memory with incorrect alignment

bevyengine · Apr 19, 2021 · ec1388f · ec1388f
1 parent 20673db
commit ec1388f
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/crates/bevy_core/src/bytes.rs b/crates/bevy_core/src/bytes.rs
@@ -50,9 +50,8 @@ where
 {
     fn from_bytes(bytes: &[u8]) -> Self {
         unsafe {
-            let byte_ptr = bytes.as_ptr();
-            let ptr = byte_ptr as *const Self;
-            (*ptr).clone()
+            let (_, body, _) = bytes.align_to::<Self>();
+            body[0].clone()
         }
     }
 }
@@ -170,10 +169,8 @@ where
 {
     fn from_bytes(bytes: &[u8]) -> Self {
         unsafe {
-            let byte_ptr = bytes.as_ptr() as *const T;
-            let len = bytes.len() / std::mem::size_of::<T>();
-            let slice = core::slice::from_raw_parts::<T>(byte_ptr, len);
-            slice.to_vec()
+            let (_, body, _) = bytes.align_to::<T>();
+            body.to_vec()
         }
     }
 }