diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-28 00:34:35 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-01-07 09:43:57 +0100 |
| commit | 61d56054a9d792882f18b0e6bfb6834a793efe2f (patch) | |
| tree | 4fb5952e191398ce6d0af1323db397c3484aff87 | |
| parent | cd254e8540b3fce4ab83e06dc1a64f69feddd9ca (diff) | |
| download | ffmpeg-61d56054a9d792882f18b0e6bfb6834a793efe2f.tar.gz | |
vqf: Make sure sample_rate is set to a valid value
This avoids divisions by zero later (and possibly assertions in
time base scaling), since an invalid rate_flag combined with an
invalid bitrate below could pass the mode combination test.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 9277050e2918e0a0df9689721a188a604d886616)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 4d60ab62e05decc562645cd6f813f7c9e69637ee)
| -rw-r--r-- | libavformat/vqf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/vqf.c b/libavformat/vqf.c index 4f8f07c919..a9b5ce784c 100644 --- a/libavformat/vqf.c +++ b/libavformat/vqf.c @@ -174,6 +174,10 @@ static int vqf_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec->sample_rate = 11025; break; default: + if (rate_flag < 8 || rate_flag > 44) { + av_log(s, AV_LOG_ERROR, "Invalid rate flag %d\n", rate_flag); + return AVERROR_INVALIDDATA; + } st->codec->sample_rate = rate_flag*1000; break; } |