From 695dc70aeb97fec00cff87f472f9dfb3c3a1d15f Mon Sep 17 00:00:00 2001 From: Chris Cunningham Date: Tue, 17 May 2016 11:28:32 -0700 Subject: [PATCH] avformat/utils: Check negative bps before shifting in ff_get_pcm_codec_id() Fixes: undefined shift. Signed-off-by: Michael Niedermayer (cherry picked from commit 2875745d354ab0ebc4af1ebaca5c5a8d26ccdc03) Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 9d996fed4e..78caf79275 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2650,7 +2650,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) {