From: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Date: Sun, 23 Oct 2016 13:54:01 +0000 (+0200)
Subject: bfi: validate sample_rate
X-Git-Tag: android-x86-7.1-r1~3231
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=872fcfcc0f01230ef761e286b0c6a18817e0a162;p=android-x86%2Fexternal-ffmpeg.git

bfi: validate sample_rate

A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
---

diff --git a/libavformat/bfi.c b/libavformat/bfi.c
index 568363dd91..ef4c17dddb 100644
--- a/libavformat/bfi.c
+++ b/libavformat/bfi.c
@@ -88,6 +88,10 @@ static int bfi_read_header(AVFormatContext * s)
                vstream->codecpar->extradata_size);
 
     astream->codecpar->sample_rate = avio_rl32(pb);
+    if (astream->codecpar->sample_rate <= 0) {
+        av_log(s, AV_LOG_ERROR, "Invalid sample rate %d\n", astream->codecpar->sample_rate);
+        return AVERROR_INVALIDDATA;
+    }
 
     /* Set up the video codec... */
     avpriv_set_pts_info(vstream, 32, 1, fps);