summaryrefslogtreecommitdiff
path: root/libavformat/segafilm.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-09-19 16:02:29 +0300
committerMartin Storsjö <martin@martin.st>2013-09-19 22:45:40 +0300
commit82e266c6d3fbf3cc74e515b883e66543381a0f2c (patch)
tree259f729db2415658a8c419987bbb5b24da1bc7cb /libavformat/segafilm.c
parent601c2015bc16f0b281160292a6a760cbbbb0eacb (diff)
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>
Diffstat (limited to 'libavformat/segafilm.c')
-rw-r--r--libavformat/segafilm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index adf24759c6..5643f33cc8 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;