summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-05-11 00:00:52 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-05-11 00:32:32 +0200
commitea791c080dd5494b3bee0c618a3f52e371b5f320 (patch)
tree24cfae484d1e4d9728464bb0332e9463fff1660e /libavformat/utils.c
parent8efaee3710baa87af40556a622bf2d96a27c6425 (diff)
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 <tguilbert@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 52395d4592..774a2ba4f3 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2955,6 +2955,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: