ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanaga...@gmail.com> | Fri Dec 4 02:04:46 2015 -0500| [89bbf01978194ee1354bb3feef139a648bc1903b] | committer: Ganesh Ajjanagadde
lavfi/af_amix: fix memory leak Recent commits 6aaac24d72a7da631173209841a3944fcb4a3309 and 3835554bf8ed78539a3492c239f979c0ab03a15f made progress towards cleaning up usage of the formats API, and in particular fixed possible NULL pointer dereferences. This commit addresses the issue of possible resource leaks when some intermediate call fails. Tested with valgrind --leak-check=full --show-leak-kinds=all, and manual simulation of malloc/realloc failures. Fixes: CID 1250334. Signed-off-by: Ganesh Ajjanagadde <gajjanaga...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89bbf01978194ee1354bb3feef139a648bc1903b --- libavfilter/af_amix.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 223328b..e64e289 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -519,20 +519,23 @@ static int query_formats(AVFilterContext *ctx) int ret; layouts = ff_all_channel_layouts(); - if (!layouts) - return AVERROR(ENOMEM); + if (!layouts) { + ret = AVERROR(ENOMEM); + goto fail; + } - if ((ret = ff_add_format(&formats, AV_SAMPLE_FMT_FLT)) < 0) - return ret; - if ((ret = ff_add_format(&formats, AV_SAMPLE_FMT_FLTP)) < 0) - return ret; - ret = ff_set_common_formats(ctx, formats); - if (ret < 0) - return ret; - ret = ff_set_common_channel_layouts(ctx, layouts); - if (ret < 0) - return ret; - return ff_set_common_samplerates(ctx, ff_all_samplerates()); + if ((ret = ff_add_format(&formats, AV_SAMPLE_FMT_FLT )) < 0 || + (ret = ff_add_format(&formats, AV_SAMPLE_FMT_FLTP)) < 0 || + (ret = ff_set_common_formats (ctx, formats)) < 0 || + (ret = ff_set_common_channel_layouts(ctx, layouts)) < 0 || + (ret = ff_set_common_samplerates(ctx, ff_all_samplerates())) < 0) + goto fail; + return 0; +fail: + if (layouts) + av_freep(&layouts->channel_layouts); + av_freep(&layouts); + return ret; } static const AVFilterPad avfilter_af_amix_outputs[] = { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
