From 301c2784b35036945cd9a7049808deecce149916 Mon Sep 17 00:00:00 2001 From: Ganesh Ajjanagadde Date: Fri, 4 Dec 2015 00:20:24 -0500 Subject: [PATCH] lavfi/vf_overlay: fix memory leaks 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 1338327. Signed-off-by: Ganesh Ajjanagadde --- libavfilter/vf_overlay.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 3c61731431..502fde00b8 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -252,23 +252,31 @@ static int query_formats(AVFilterContext *ctx) switch (s->format) { case OVERLAY_FORMAT_YUV420: if (!(main_formats = ff_make_format_list(main_pix_fmts_yuv420)) || - !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv420))) - return AVERROR(ENOMEM); + !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv420))) { + ret = AVERROR(ENOMEM); + goto fail; + } break; case OVERLAY_FORMAT_YUV422: if (!(main_formats = ff_make_format_list(main_pix_fmts_yuv422)) || - !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv422))) - return AVERROR(ENOMEM); + !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv422))) { + ret = AVERROR(ENOMEM); + goto fail; + } break; case OVERLAY_FORMAT_YUV444: if (!(main_formats = ff_make_format_list(main_pix_fmts_yuv444)) || - !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv444))) - return AVERROR(ENOMEM); + !(overlay_formats = ff_make_format_list(overlay_pix_fmts_yuv444))) { + ret = AVERROR(ENOMEM); + goto fail; + } break; case OVERLAY_FORMAT_RGB: if (!(main_formats = ff_make_format_list(main_pix_fmts_rgb)) || - !(overlay_formats = ff_make_format_list(overlay_pix_fmts_rgb))) - return AVERROR(ENOMEM); + !(overlay_formats = ff_make_format_list(overlay_pix_fmts_rgb))) { + ret = AVERROR(ENOMEM); + goto fail; + } break; default: av_assert0(0); @@ -277,9 +285,17 @@ static int query_formats(AVFilterContext *ctx) if ((ret = ff_formats_ref(main_formats , &ctx->inputs[MAIN]->out_formats )) < 0 || (ret = ff_formats_ref(overlay_formats, &ctx->inputs[OVERLAY]->out_formats)) < 0 || (ret = ff_formats_ref(main_formats , &ctx->outputs[MAIN]->in_formats )) < 0) - return ret; + goto fail; return 0; +fail: + if (main_formats) + av_freep(&main_formats->formats); + av_freep(&main_formats); + if (overlay_formats) + av_freep(&overlay_formats->formats); + av_freep(&overlay_formats); + return ret; } static const enum AVPixelFormat alpha_pix_fmts[] = {