Fix UB due to use of from_const_array

3 years ago · e5b0588cca
parent f4379d5688
commit e5b0588cca
1 changed files with 5 additions and 1 deletions
--- a/server/src/coredb/memstore.rs
+++ b/server/src/coredb/memstore.rs
@ -70,7 +70,11 @@ const DEFAULT_ARRAY: [u8; 7] = [b'd', b'e', b'f', b'a', b'u', b'l', b't'];
 type NsKsTblId = Array<u8, 64>;
 macro_rules! defaultid {
    () => {{
-        unsafe { Array::from_const_array(DEFAULT_ARRAY) }
+        unsafe {
+            let mut array = Array::new();
+            array.extend_from_slice_unchecked(&DEFAULT_ARRAY[..]);
+            array
+        }
    }};
 }