refactor: make silk_short2float_array safe

Author: DCNick3

src/silk/control_codec.rs

@@ -116,9 +116,8 @@ unsafe fn silk_setup_resamplers(psEnc: *mut silk_encoder_state_FLP, fs_kHz: i32)
                 &x_buf_API_fs_Hz[..api_buf_samples as usize],
             );
             silk_short2float_array(
-                ((*psEnc).x_buf).as_mut_ptr(),
-                x_bufFIX.as_mut_ptr(),
-                new_buf_samples,
+                &mut (*psEnc).x_buf[..new_buf_samples as usize],
+                &x_bufFIX[..new_buf_samples as usize],
             );
         }
     }

src/silk/float/SigProc_FLP.rs

@@ -17,12 +17,12 @@ pub fn silk_float2short_array(out: &mut [i16], input: &[f32]) {
 }
 
 #[inline]
-pub unsafe fn silk_short2float_array(out: *mut f32, in_0: *const i16, length: i32) {
-    let mut k: i32 = 0;
-    k = length - 1;
-    while k >= 0 {
-        *out.offset(k as isize) = *in_0.offset(k as isize) as f32;
-        k -= 1;
+pub fn silk_short2float_array(out: &mut [f32], input: &[i16]) {
+    let length = out.len();
+    assert_eq!(length, input.len());
+
+    for k in (0..length).rev() {
+        out[k] = input[k] as f32;
     }
 }
 

src/silk/float/encode_frame_FLP.rs

@@ -153,9 +153,14 @@ pub unsafe fn silk_encode_frame_FLP(
         (*psEnc).sCmn.frame_length,
     );
     silk_short2float_array(
-        x_frame.offset((LA_SHAPE_MS * (*psEnc).sCmn.fs_kHz) as isize),
-        ((*psEnc).sCmn.inputBuf).as_mut_ptr().offset(1 as isize),
-        (*psEnc).sCmn.frame_length,
+        std::slice::from_raw_parts_mut(
+            x_frame.offset((LA_SHAPE_MS * (*psEnc).sCmn.fs_kHz) as isize),
+            (*psEnc).sCmn.frame_length as usize,
+        ),
+        std::slice::from_raw_parts(
+            ((*psEnc).sCmn.inputBuf).as_mut_ptr().offset(1 as isize),
+            (*psEnc).sCmn.frame_length as usize,
+        ),
     );
     i = 0;
     while i < 8 {

src/silk/float/pitch_analysis_core_FLP.rs

@@ -125,9 +125,8 @@ pub unsafe fn silk_pitch_analysis_core_FLP(
             &frame_16_FIX[..frame_length as usize],
         );
         silk_short2float_array(
-            frame_8kHz.as_mut_ptr(),
-            frame_8_FIX.as_mut_ptr(),
-            frame_length_8kHz,
+            &mut frame_8kHz[..frame_length_8kHz as usize],
+            &frame_8_FIX[..frame_length_8kHz as usize],
         );
     } else if Fs_kHz == 12 {
         let mut frame_12_FIX: [i16; 480] = [0; 480];
@@ -142,9 +141,8 @@ pub unsafe fn silk_pitch_analysis_core_FLP(
             &frame_12_FIX[..frame_length as usize],
         );
         silk_short2float_array(
-            frame_8kHz.as_mut_ptr(),
-            frame_8_FIX.as_mut_ptr(),
-            frame_length_8kHz,
+            &mut frame_8kHz[..frame_length_8kHz as usize],
+            &frame_8_FIX[..frame_length_8kHz as usize],
         );
     } else {
         assert!(Fs_kHz == 8);
@@ -163,9 +161,8 @@ pub unsafe fn silk_pitch_analysis_core_FLP(
         );
     }
     silk_short2float_array(
-        frame_4kHz.as_mut_ptr(),
-        frame_4_FIX.as_mut_ptr(),
-        frame_length_4kHz,
+        &mut frame_4kHz[..frame_length_4kHz as usize],
+        &frame_4_FIX[..frame_length_4kHz as usize],
     );
     i = frame_length_4kHz - 1;
     while i > 0 {