Skip to content

Fix panic when using linear or ZOH resampling #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BillyDM wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix panic when using linear or ZOH resampling #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a9052a
use unchecked indexing for VLAs
Jul 12, 2022
565e5f5
remove no_mangle warnings
Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "libsamplerate"
authors = ["Ramy <RamiHg@users.noreply.github.com>"]
version = "0.1.0"
version = "0.1.1"
edition = "2018"

description = "A pure C2Rust transpiled version of libsamplerate."
Expand Down
15 changes: 0 additions & 15 deletions src/samplerate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,43 +17,28 @@ extern "C" {
/* __cplusplus */
/* Opaque data type SRC_STATE. */

#[no_mangle]
fn calloc(_: libc::c_ulong, _: libc::c_ulong) -> *mut libc::c_void;
#[no_mangle]
fn free(_: *mut libc::c_void);
#[no_mangle]
fn memcpy(_: *mut libc::c_void, _: *const libc::c_void, _: libc::c_ulong)
-> *mut libc::c_void;
#[no_mangle]
fn memset(_: *mut libc::c_void, _: libc::c_int, _: libc::c_ulong)
-> *mut libc::c_void;
#[no_mangle]
fn linear_set_converter(psrc: *mut SRC_PRIVATE, src_enum: libc::c_int)
-> libc::c_int;
#[no_mangle]
fn zoh_set_converter(psrc: *mut SRC_PRIVATE, src_enum: libc::c_int)
-> libc::c_int;
#[no_mangle]
fn sinc_set_converter(psrc: *mut SRC_PRIVATE, src_enum: libc::c_int)
-> libc::c_int;
#[no_mangle]
fn fabs(_: libc::c_double) -> libc::c_double;
/* In src_linear.c */
#[no_mangle]
fn linear_get_name(src_enum: libc::c_int) -> *const libc::c_char;
/* In src_zoh.c */
#[no_mangle]
fn zoh_get_name(src_enum: libc::c_int) -> *const libc::c_char;
/* In src_sinc.c */
#[no_mangle]
fn sinc_get_name(src_enum: libc::c_int) -> *const libc::c_char;
#[no_mangle]
fn linear_get_description(src_enum: libc::c_int) -> *const libc::c_char;
#[no_mangle]
fn zoh_get_description(src_enum: libc::c_int) -> *const libc::c_char;
#[no_mangle]
fn sinc_get_description(src_enum: libc::c_int) -> *const libc::c_char;
#[no_mangle]
fn lrint(_: libc::c_double) -> libc::c_long;
}
pub type SRC_STATE = SRC_STATE_tag;
Expand Down
15 changes: 4 additions & 11 deletions src/src_linear.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
use libc;
extern "C" {
#[no_mangle]
fn calloc(_: libc::c_ulong, _: libc::c_ulong) -> *mut libc::c_void;
#[no_mangle]
fn free(_: *mut libc::c_void);
#[no_mangle]
fn exit(_: libc::c_int) -> !;
#[no_mangle]
fn memcpy(_: *mut libc::c_void, _: *const libc::c_void, _: libc::c_ulong) -> *mut libc::c_void;
#[no_mangle]
fn memset(_: *mut libc::c_void, _: libc::c_int, _: libc::c_ulong) -> *mut libc::c_void;
#[no_mangle]
fn fabs(_: libc::c_double) -> libc::c_double;
#[no_mangle]
fn lrint(_: libc::c_double) -> libc::c_long;
}
pub type __darwin_size_t = libc::c_ulong;
Expand Down Expand Up @@ -236,7 +229,7 @@ unsafe extern "C" fn linear_vari_process(
if 0 != (*priv_0).reset {
ch = 0i32;
while ch < (*priv_0).channels {
(*priv_0).last_value[ch as usize] = *(*data).data_in.offset(ch as isize);
*(*priv_0).last_value.get_unchecked_mut(ch as usize) = *(*data).data_in.offset(ch as isize);
ch += 1
}
(*priv_0).reset = 0i32
Expand Down Expand Up @@ -267,9 +260,9 @@ unsafe extern "C" fn linear_vari_process(
ch = 0i32;
while ch < (*priv_0).channels {
*(*data).data_out.offset((*priv_0).out_gen as isize) =
((*priv_0).last_value[ch as usize] as libc::c_double
(*(*priv_0).last_value.get_unchecked(ch as usize) as libc::c_double
+ input_index
* (*(*data).data_in.offset(ch as isize) - (*priv_0).last_value[ch as usize])
* (*(*data).data_in.offset(ch as isize) - *(*priv_0).last_value.get_unchecked(ch as usize))
as libc::c_double) as libc::c_float;
(*priv_0).out_gen += 1;
ch += 1
Expand Down Expand Up @@ -328,7 +321,7 @@ unsafe extern "C" fn linear_vari_process(
if (*priv_0).in_used > 0i32 as libc::c_long {
ch = 0i32;
while ch < (*priv_0).channels {
(*priv_0).last_value[ch as usize] = *(*data).data_in.offset(
*(*priv_0).last_value.get_unchecked_mut(ch as usize) = *(*data).data_in.offset(
((*priv_0).in_used - (*priv_0).channels as libc::c_long + ch as libc::c_long)
as isize,
);
Expand Down
7 changes: 0 additions & 7 deletions src/src_sinc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
use libc;
extern "C" {
#[no_mangle]
fn calloc(_: libc::c_ulong, _: libc::c_ulong) -> *mut libc::c_void;
#[no_mangle]
fn free(_: *mut libc::c_void);
#[no_mangle]
fn memcpy(_: *mut libc::c_void, _: *const libc::c_void, _: libc::c_ulong)
-> *mut libc::c_void;
#[no_mangle]
fn memmove(_: *mut libc::c_void, _: *const libc::c_void, _: libc::c_ulong)
-> *mut libc::c_void;
#[no_mangle]
fn memset(_: *mut libc::c_void, _: libc::c_int, _: libc::c_ulong)
-> *mut libc::c_void;
#[no_mangle]
fn fabs(_: libc::c_double) -> libc::c_double;
#[no_mangle]
fn lrint(_: libc::c_double) -> libc::c_long;
}
pub type __darwin_size_t = libc::c_ulong;
Expand Down
12 changes: 3 additions & 9 deletions src/src_zoh.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
use libc;
extern "C" {
#[no_mangle]
fn calloc(_: libc::c_ulong, _: libc::c_ulong) -> *mut libc::c_void;
#[no_mangle]
fn free(_: *mut libc::c_void);
#[no_mangle]
fn memcpy(_: *mut libc::c_void, _: *const libc::c_void, _: libc::c_ulong)
-> *mut libc::c_void;
#[no_mangle]
fn memset(_: *mut libc::c_void, _: libc::c_int, _: libc::c_ulong)
-> *mut libc::c_void;
#[no_mangle]
fn fabs(_: libc::c_double) -> libc::c_double;
#[no_mangle]
fn lrint(_: libc::c_double) -> libc::c_long;
}
pub type __darwin_size_t = libc::c_ulong;
Expand Down Expand Up @@ -227,7 +221,7 @@ unsafe extern "C" fn zoh_vari_process(mut psrc: *mut SRC_PRIVATE,
if 0 != (*priv_0).reset {
ch = 0i32;
while ch < (*priv_0).channels {
(*priv_0).last_value[ch as usize] =
*(*priv_0).last_value.get_unchecked_mut(ch as usize) =
*(*data).data_in.offset(ch as isize);
ch += 1
}
Expand Down Expand Up @@ -261,7 +255,7 @@ unsafe extern "C" fn zoh_vari_process(mut psrc: *mut SRC_PRIVATE,
ch = 0i32;
while ch < (*priv_0).channels {
*(*data).data_out.offset((*priv_0).out_gen as isize) =
(*priv_0).last_value[ch as usize];
*(*priv_0).last_value.get_unchecked(ch as usize);
(*priv_0).out_gen += 1;
ch += 1
}
Expand Down Expand Up @@ -309,7 +303,7 @@ unsafe extern "C" fn zoh_vari_process(mut psrc: *mut SRC_PRIVATE,
if (*priv_0).in_used > 0i32 as libc::c_long {
ch = 0i32;
while ch < (*priv_0).channels {
(*priv_0).last_value[ch as usize] =
*(*priv_0).last_value.get_unchecked_mut(ch as usize) =
*(*data).data_in.offset(((*priv_0).in_used -
(*priv_0).channels as
libc::c_long +
Expand Down