ffmpeg | branch: release/2.8 | Chris Cunningham <chcunning...@chromium.org> | Tue May 17 11:28:32 2016 -0700| [c1c6cb21b7d2e9bc82142ff0906fabef835b12ad] | committer: Michael Niedermayer
avformat/utils: Check negative bps before shifting in ff_get_pcm_codec_id() Fixes: undefined shift. Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 2875745d354ab0ebc4af1ebaca5c5a8d26ccdc03) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1c6cb21b7d2e9bc82142ff0906fabef835b12ad --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d638ace..930b235 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2785,7 +2785,7 @@ 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) + if (bps <= 0 || bps > 64) return AV_CODEC_ID_NONE; if (flt) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
