You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-04 22:03:09 +02:00
avfilter/asrc_sinc: fix leak in config_input()
In config_input(), fir_to_phase() allocates memory in h[longer], which would leak if av_calloc() to s->coeffs failed. lpf() allocates memory in h[0] and h[1], which would leak if fir_to_phase() failed. To fix this leak, add av_free(h[longer]) in as cleanup code, and replace return AVERROR* with goto cleanup to prevent from leaks. Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
committed by
Michael Niedermayer
parent
5f62e2de98
commit
a4a71b5e9d
@ -329,7 +329,7 @@ static int config_output(AVFilterLink *outlink)
|
|||||||
SincContext *s = ctx->priv;
|
SincContext *s = ctx->priv;
|
||||||
float Fn = s->sample_rate * .5f;
|
float Fn = s->sample_rate * .5f;
|
||||||
float *h[2];
|
float *h[2];
|
||||||
int i, n, post_peak, longer;
|
int i, n, post_peak, longer, ret;
|
||||||
|
|
||||||
outlink->sample_rate = s->sample_rate;
|
outlink->sample_rate = s->sample_rate;
|
||||||
s->pts = 0;
|
s->pts = 0;
|
||||||
@ -360,9 +360,9 @@ static int config_output(AVFilterLink *outlink)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (s->phase != 50.f) {
|
if (s->phase != 50.f) {
|
||||||
int ret = fir_to_phase(s, &h[longer], &n, &post_peak, s->phase);
|
ret = fir_to_phase(s, &h[longer], &n, &post_peak, s->phase);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
goto cleanup;
|
||||||
} else {
|
} else {
|
||||||
post_peak = n >> 1;
|
post_peak = n >> 1;
|
||||||
}
|
}
|
||||||
@ -370,17 +370,21 @@ static int config_output(AVFilterLink *outlink)
|
|||||||
s->n = 1 << (av_log2(n) + 1);
|
s->n = 1 << (av_log2(n) + 1);
|
||||||
s->rdft_len = 1 << av_log2(n);
|
s->rdft_len = 1 << av_log2(n);
|
||||||
s->coeffs = av_calloc(s->n, sizeof(*s->coeffs));
|
s->coeffs = av_calloc(s->n, sizeof(*s->coeffs));
|
||||||
if (!s->coeffs)
|
if (!s->coeffs) {
|
||||||
return AVERROR(ENOMEM);
|
ret = AVERROR(ENOMEM);
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < n; i++)
|
for (i = 0; i < n; i++)
|
||||||
s->coeffs[i] = h[longer][i];
|
s->coeffs[i] = h[longer][i];
|
||||||
av_free(h[longer]);
|
|
||||||
|
|
||||||
av_tx_uninit(&s->tx);
|
av_tx_uninit(&s->tx);
|
||||||
av_tx_uninit(&s->itx);
|
av_tx_uninit(&s->itx);
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
return 0;
|
cleanup:
|
||||||
|
av_free(h[longer]);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static av_cold void uninit(AVFilterContext *ctx)
|
static av_cold void uninit(AVFilterContext *ctx)
|
||||||
|
Reference in New Issue
Block a user