Browse Source

vqf: Make sure the bitrate is in the valid range

Even if the sample rate is valid, an invalid bitrate could
pass the mode combination test below.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n2.1
Martin Storsjö 11 years ago
parent
commit
68ff998128
1 changed files with 7 additions and 0 deletions
  1. +7
    -0
      libavformat/vqf.c

+ 7
- 0
libavformat/vqf.c View File

@@ -182,6 +182,13 @@ static int vqf_read_header(AVFormatContext *s)
break;
}

if (read_bitrate / st->codec->channels < 8 ||
read_bitrate / st->codec->channels > 48) {
av_log(s, AV_LOG_ERROR, "Invalid bitrate per channel %d\n",
read_bitrate / st->codec->channels);
return AVERROR_INVALIDDATA;
}

switch (((st->codec->sample_rate/1000) << 8) +
read_bitrate/st->codec->channels) {
case (11<<8) + 8 :


Loading…
Cancel
Save