From: Martin Storsjö <martin@martin.st>
Date: Thu, 19 Sep 2013 13:02:29 +0000 (+0300)
Subject: segafilm: Validate the number of audio channels
X-Git-Tag: v10_alpha1~708
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82e266c6d3fbf3cc74e515b883e66543381a0f2c;p=platform%2Fupstream%2Flibav.git

segafilm: Validate the number of audio channels

This avoids divisions by zero later.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
---

diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index adf2475..5643f33 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -111,6 +111,11 @@ static int film_read_header(AVFormatContext *s)
             return AVERROR(EIO);
         film->audio_samplerate = AV_RB16(&scratch[24]);
         film->audio_channels = scratch[21];
+        if (!film->audio_channels || film->audio_channels > 2) {
+            av_log(s, AV_LOG_ERROR,
+                   "Invalid number of channels: %d\n", film->audio_channels);
+            return AVERROR_INVALIDDATA;
+        }
         film->audio_bits = scratch[22];
         if (scratch[23] == 2)
             film->audio_type = AV_CODEC_ID_ADPCM_ADX;