[FFmpeg-devel] [PATCH 3/4] avformat/wsddec: Fix undefined shift

Michael Niedermayer michael at niedermayer.cc
Fri Jun 21 17:56:23 EEST 2019


On Sat, Jun 08, 2019 at 06:11:02PM +0200, Reimar Döffinger wrote:
> 
> 
> On 08.06.2019, at 11:28, Michael Niedermayer <michael at niedermayer.cc> wrote:
> 
> > Fixes: left shift of 1 by 31 places cannot be represented in type 'int'
> > Fixes: 15123/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5738039235575808
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> > libavformat/wsddec.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/libavformat/wsddec.c b/libavformat/wsddec.c
> > index dfa8014b1c..43660d4cea 100644
> > --- a/libavformat/wsddec.c
> > +++ b/libavformat/wsddec.c
> > @@ -137,7 +137,7 @@ static int wsd_read_header(AVFormatContext *s)
> >     if (!(channel_assign & 1)) {
> >         int i;
> >         for (i = 1; i < 32; i++)
> > -            if (channel_assign & (1 << i))
> > +            if (channel_assign & (1U << i))
> 
> I'd be in favour of switching these kind of checks to
> (a>>i)&1
> as this is a much less risky idiom and IMO it would be best to spread that style...

will push patchset with this change

thanks

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

The educated differ from the uneducated as much as the living from the
dead. -- Aristotle 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20190621/cfc4a259/attachment.sig>


More information about the ffmpeg-devel mailing list