Re: [FFmpeg-devel] [PATCH 1/2] avutil/channel_layout: av_channel_layout_describe_bprint: Check for buffer end

From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 1/2] avutil/channel_layout: av_channel_layout_describe_bprint: Check for buffer end
Date: Sat, 2 Jul 2022 16:29:56 +0200
Message-ID: <20220702142956.GD396728@pb2> (raw)
In-Reply-To: <66a06af2-978e-6152-f0a9-505e842493b8@gmail.com>

[-- Attachment #1.1: Type: text/plain, Size: 1488 bytes --]

On Fri, Jul 01, 2022 at 04:30:57PM -0300, James Almer wrote:
> On 7/1/2022 4:25 PM, Michael Niedermayer wrote:
> > Fixes: Timeout printing a billion channels
> > Fixes: 48099/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-6754782204788736
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >   libavutil/channel_layout.c | 4 ++++
> >   1 file changed, 4 insertions(+)
> > 
> > diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
> > index 21b70173b7..72969eff14 100644
> > --- a/libavutil/channel_layout.c
> > +++ b/libavutil/channel_layout.c
> > @@ -757,6 +757,10 @@ int av_channel_layout_describe_bprint(const AVChannelLayout *channel_layout,
> >               if (channel_layout->order == AV_CHANNEL_ORDER_CUSTOM &&
> >                   channel_layout->u.map[i].name[0])
> >                   av_bprintf(bp, "@%s", channel_layout->u.map[i].name);
> > +
> > +            if (!av_bprint_is_complete(bp))
> > +                return AVERROR(EINVAL);
> 
> Should be ENOMEM.
> 
> LGTM with that change.

will changa and apply

thx
[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many things microsoft did are stupid, but not doing something just because
microsoft did it is even more stupid. If everything ms did were stupid they
would be bankrupt already.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".