ericonr
/
sndio
mirror of https://github.com/ericonr/sndio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix off-by-one array access when 64 channel stream is resampled

This commit is contained in:
Alexandre Ratchov 2021-07-05 10:30:37 +02:00
parent aac840d9f9
commit c4b354abd7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aucat/dsp.c
View File

@ -429,7 +429,7 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int icnt, int ocnt)
if (ofr == 0)
break;
for (c = nch; c > 0; c--)
for (c = 0; c < nch; c++)
f[c] = 0;
q = diff * p->filt_step;
@ -442,7 +442,7 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int icnt, int ocnt)
ds = resamp_filt[qi + 1] - s;
s += (int64_t)qf * ds >> RESAMP_STEP_BITS;
ctx = ctxbuf;
for (c = nch; c > 0; c--) {
for (c = 0; c < nch; c++) {
f[c] += (int64_t)ctx[n] * s;
ctx += RESAMP_NCTX;
}
@ -450,7 +450,7 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int icnt, int ocnt)
n = (n + 1) & (RESAMP_NCTX - 1);
}
for (c = nch; c > 0; c--) {
for (c = 0; c < nch; c++) {
s = f[c] >> RESAMP_BITS;
s = (int64_t)s * p->filt_cutoff >> RESAMP_BITS;
#if ADATA_BITS == 16

6
sndiod/dsp.c
View File

@ -321,7 +321,7 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo)
todo--;
} else {
for (c = nch; c > 0; c--)
for (c = 0; c < nch; c++)
f[c] = 0;
q = diff * p->filt_step;
@ -334,7 +334,7 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo)
ds = resamp_filt[qi + 1] - s;
s += (int64_t)qf * ds >> RESAMP_STEP_BITS;
ctx = ctxbuf;
for (c = nch; c > 0; c--) {
for (c = 0; c < nch; c++) {
f[c] += (int64_t)ctx[n] * s;
ctx += RESAMP_NCTX;
}
@ -342,7 +342,7 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo)
n = (n + 1) & (RESAMP_NCTX - 1);
}
for (c = nch; c > 0; c--) {
for (c = 0; c < nch; c++) {
s = f[c] >> RESAMP_BITS;
s = (int64_t)s * p->filt_cutoff >> RESAMP_BITS;
#if ADATA_BITS == 16