aboutsummaryrefslogtreecommitdiff
path: root/libavformat/vqf.c
diff options
context:
space:
mode:
authorMartin Storsjö2013-09-28 00:34:35 +0300
committerMartin Storsjö2013-09-29 18:46:21 +0300
commit9277050e2918e0a0df9689721a188a604d886616 (patch)
tree4edac7535036e4f6abb10273ec3b1e11ce0216ae /libavformat/vqf.c
parent0767bfd1994c4bf22e167ffadb8f823a950aad18 (diff)
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>
Diffstat (limited to 'libavformat/vqf.c')
-rw-r--r--libavformat/vqf.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/vqf.c b/libavformat/vqf.c
index ab1042aa29..162c7530d1 100644
--- a/libavformat/vqf.c
+++ b/libavformat/vqf.c
@@ -174,6 +174,10 @@ static int vqf_read_header(AVFormatContext *s)
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;
}