Browse Source

avformat/utils: Check negative bps before shifting in ff_get_pcm_codec_id()

Fixes: undefined shift.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2875745d35)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.4.14
Chris Cunningham Michael Niedermayer 9 years ago
parent
commit
695dc70aeb
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavformat/utils.c

+ 1
- 1
libavformat/utils.c View File

@@ -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) 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; return AV_CODEC_ID_NONE;


if (flt) { if (flt) {


Loading…
Cancel
Save