Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-08-22 05:47:14 +0300
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-08-27 00:52:56 +0300
commit97b1a2c564e0d4dbf8573b4647ae110a75238db3 (patch)
tree2de00d158fedaa58c9afb40479d0053ad576e96f
parent281b8187e355b42f86b7a62f0fe93e6093484051 (diff)
avfilter/af_aiir: Fix segfault and leak upon allocation failure
The aiir filter adds output pads in its init function. Each of these output pads had a name which was allocated and to be freed in the uninit function. Given that the aiir filter has between one and two outputs, one output pad's name was freed unconditionally and a second was freed conditionally. Yet if adding output pads fails, there are no output pads at all and trying to free a nonexistent pad's name will lead to a segfault. Furthermore, if the name could be successfully allocated, yet adding the new pad fails, the name would leak. This commit fixes this by not allocating the pads' names at all any more: They are constant anyway. This allows to remove the code to free them and hence fixes the aforementioned bugs. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavfilter/af_aiir.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c
index bc31e5141e..3df25b4d9b 100644
--- a/libavfilter/af_aiir.c
+++ b/libavfilter/af_aiir.c
@@ -1159,26 +1159,21 @@ static av_cold int init(AVFilterContext *ctx)
}
pad = (AVFilterPad){
- .name = av_strdup("default"),
+ .name = "default",
.type = AVMEDIA_TYPE_AUDIO,
.config_props = config_output,
};
- if (!pad.name)
- return AVERROR(ENOMEM);
-
ret = ff_insert_outpad(ctx, 0, &pad);
if (ret < 0)
return ret;
if (s->response) {
vpad = (AVFilterPad){
- .name = av_strdup("filter_response"),
+ .name = "filter_response",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_video,
};
- if (!vpad.name)
- return AVERROR(ENOMEM);
ret = ff_insert_outpad(ctx, 1, &vpad);
if (ret < 0)
@@ -1205,9 +1200,6 @@ static av_cold void uninit(AVFilterContext *ctx)
}
av_freep(&s->iir);
- av_freep(&ctx->output_pads[0].name);
- if (s->response)
- av_freep(&ctx->output_pads[1].name);
av_frame_free(&s->video);
}