[FFmpeg-devel] [PATCH 07/21] avfilter/af_afir: Fix leak of AVFilterChannelLayout in case of error

[Paul B Mahol]

On 8/18/20, Andreas Rheinhardt <andreas.rheinhardt at gmail.com> wrote:
> Andreas Rheinhardt:
>> If an error happens between the allocation of an AVFilterChannelLayout
>> and its usage (which involves attaching said object to a more permanent
>> object), the channel layout array leaks. This can simply be fixed by
>> making sure that nothing is between the allocation and the
>> aforementioned usage.
>>
>> Fixes Coverity issue #1250334.
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
>> ---
>>  libavfilter/af_afir.c | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c
>> index 5ba880f10b..6cbc7a00a1 100644
>> --- a/libavfilter/af_afir.c
>> +++ b/libavfilter/af_afir.c
>> @@ -742,14 +742,14 @@ static int query_formats(AVFilterContext *ctx)
>>      } else {
>>          AVFilterChannelLayouts *mono = NULL;
>>
>> -        ret = ff_add_channel_layout(&mono, AV_CH_LAYOUT_MONO);
>> -        if (ret)
>> -            return ret;
>> -
>>          if ((ret = ff_channel_layouts_ref(layouts,
>> &ctx->inputs[0]->out_channel_layouts)) < 0)
>>              return ret;
>>          if ((ret = ff_channel_layouts_ref(layouts,
>> &ctx->outputs[0]->in_channel_layouts)) < 0)
>>              return ret;
>> +
>> +        ret = ff_add_channel_layout(&mono, AV_CH_LAYOUT_MONO);
>> +        if (ret)
>> +            return ret;
>>          for (int i = 1; i < ctx->nb_inputs; i++) {
>>              if ((ret = ff_channel_layouts_ref(mono,
>> &ctx->inputs[i]->out_channel_layouts)) < 0)
>>                  return ret;
>>
> Ping for this and the other outstanding patches of this patchset.

LGTM

>
> - Andreas
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".