vqf: Make sure sample_rate is set to a valid value
authorMartin Storsjö <martin@martin.st>
Fri, 27 Sep 2013 21:34:35 +0000 (00:34 +0300)
committerMartin Storsjö <martin@martin.st>
Sun, 29 Sep 2013 15:46:21 +0000 (18:46 +0300)
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>
libavformat/vqf.c

index ab1042a..162c753 100644 (file)
@@ -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;
     }