ffmpeg | branch: release/2.8 | Michael Niedermayer <mich...@niedermayer.cc> | Wed May 11 00:00:52 2016 +0200| [fc6f314838dc2f192bd42d6bcf67aa9d5280908f] | committer: Michael Niedermayer
avformat/utils: Check bps before using it in a shift in ff_get_pcm_codec_id() Fixes undefined shift Fixes: usan_shift Found-by: Thomas Guilbert <tguilb...@google.com> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit ea791c080dd5494b3bee0c618a3f52e371b5f320) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc6f314838dc2f192bd42d6bcf67aa9d5280908f --- libavformat/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 5ee4436..d40ae64 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2785,6 +2785,9 @@ enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag) enum AVCodecID ff_get_pcm_codec_id(int bps, int flt, int be, int sflags) { + if (bps > 64U) + return AV_CODEC_ID_NONE; + if (flt) { switch (bps) { case 32: _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
