[FFmpeg-devel] [PATCH 1/3] lavfi/af_pan: check ff_all_channel_counts() return.
gajjanag at mit.edu
Tue Oct 6 12:39:26 CEST 2015
On Tue, Oct 6, 2015 at 4:18 AM, Nicolas George <george at nsup.org> wrote:
> Fix CID 1325680.
> Signed-off-by: Nicolas George <george at nsup.org>
> libavfilter/af_pan.c | 2 ++
> 1 file changed, 2 insertions(+)
> Will push this series soon unless somebody objects.
The 1000 line diff I posted should take care of this and all other
such unchecked stuff in query_formats across libavfilter :). I don't
mind either way, though if this is applied, I will perhaps need to
rebase my stuff to avoid merge conflicts. Really it is a question of
whether people want a single patch or multiple patches - note that
there are over 40 files that need cleanup.
> diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
> index 9117cc0..d116818 100644
> --- a/libavfilter/af_pan.c
> +++ b/libavfilter/af_pan.c
> @@ -239,6 +239,8 @@ static int query_formats(AVFilterContext *ctx)
> // inlink supports any channel layout
> layouts = ff_all_channel_counts();
> + if (!layouts)
> + return AVERROR(ENOMEM);
> ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts);
> // outlink supports only requested output channel layout
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
More information about the ffmpeg-devel