Module: libav Branch: release/0.8 Commit: efe59ad90bce0e7d03319356b13fe83dde2eecc5
Author: Martin Storsjö <[email protected]> Committer: Luca Barbato <[email protected]> Date: Sat Sep 28 23:19:10 2013 +0300 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: [email protected] Signed-off-by: Martin Storsjö <[email protected]> (cherry picked from commit 68ff9981283a56c731f00c2ee7901103665092fc) Signed-off-by: Luca Barbato <[email protected]> (cherry picked from commit 60701469ab9f526841ae81444236425f87916adb) --- libavformat/vqf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/vqf.c b/libavformat/vqf.c index a9b5ce7..253ddec 100644 --- a/libavformat/vqf.c +++ b/libavformat/vqf.c @@ -182,6 +182,13 @@ static int vqf_read_header(AVFormatContext *s, AVFormatParameters *ap) 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 : _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
