virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avfilter/af_aiir: do not crash with invalid options

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2018-01-05 19:55:09 +01:00
parent 89b84cb18b
commit 52c959a237
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavfilter/af_aiir.c
View File

@ -127,6 +127,9 @@ static void count_coefficients(char *item_str, int *nb_items)
{
char *p;
if (!item_str)
return;
*nb_items = 1;
for (p = item_str; *p && *p != '|'; p++) {
if (*p == ' ')
@ -170,10 +173,14 @@ static int read_channels(AVFilterContext *ctx, int channels, uint8_t *item_str,
if (!(arg = av_strtok(p, "|", &saveptr)))
arg = prev_arg;
p = NULL;
if (!arg)
return AVERROR(EINVAL);
count_coefficients(arg, &nb[i]);
cache[i] = av_calloc(nb[i], sizeof(cache[i]));
c[i] = av_calloc(nb[i], sizeof(c[i]));
p = NULL;
cache[i] = av_calloc(nb[i] + 1, sizeof(double));
c[i] = av_calloc(nb[i], sizeof(double));
if (!c[i] || !cache[i])
return AVERROR(ENOMEM);
@ -263,6 +270,18 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
return ff_filter_frame(outlink, out);
}
static av_cold int init(AVFilterContext *ctx)
{
AudioIIRContext *s = ctx->priv;
if (!s->a_str || !s->b_str) {
av_log(ctx, AV_LOG_ERROR, "Valid coefficients are mandatory.\n");
return AVERROR(EINVAL);
}
return 0;
}
static av_cold void uninit(AVFilterContext *ctx)
{
AudioIIRContext *s = ctx->priv;
@ -326,6 +345,7 @@ AVFilter ff_af_aiir = {
.name = "aiir",
.description = NULL_IF_CONFIG_SMALL("Apply Infinite Impulse Response filter with supplied coefficients."),
.priv_size = sizeof(AudioIIRContext),
.init = init,
.uninit = uninit,
.query_formats = query_formats,
.inputs = inputs,