diff mbox

[FFmpeg-devel,10/12] oggparsespeex: validate sample_rate

Message ID 6ef771ac-2ae1-480c-f655-236d5819fced@googlemail.com
State Accepted
Commit eb205eda3fec9959037c419548b1ebfaa6c59c33
Headers show

Commit Message

Andreas Cadhalpun Oct. 23, 2016, 4:30 p.m. UTC 
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
---
 libavformat/oggparsespeex.c | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox

Patch

diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index 434b0fd..2b49150 100644
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -68,6 +68,10 @@  static int speex_header(AVFormatContext *s, int idx) {
         }
 
         st->codecpar->sample_rate = AV_RL32(p + 36);
+        if (st->codecpar->sample_rate <= 0) {
+            av_log(s, AV_LOG_ERROR, "Invalid sample rate %d\n", st->codecpar->sample_rate);
+            return AVERROR_INVALIDDATA;
+        }
         st->codecpar->channels = AV_RL32(p + 48);
         if (st->codecpar->channels < 1 || st->codecpar->channels > 2) {
             av_log(s, AV_LOG_ERROR, "invalid channel count. Speex must be mono or stereo.\n");