[FFmpeg-cvslog] segafilm: Fix potential division by 0 on corrupted streams in the demuxer

Laurent Aimar git at videolan.org
Fri Oct 7 03:49:15 CEST 2011


ffmpeg | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Sep 12 21:09:57 2011 +0200| [762ffa6861a8afefe11e1fe18e7b47c18d2d62f6] | committer: Janne Grunau

segafilm: Fix potential division by 0 on corrupted streams in the demuxer

Signed-off-by: Janne Grunau <janne-libav at jannau.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=762ffa6861a8afefe11e1fe18e7b47c18d2d62f6
---

 libavformat/segafilm.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 32a979f..ea464f2 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -113,11 +113,14 @@ static int film_read_header(AVFormatContext *s,
         film->audio_bits = scratch[22];
         if (scratch[23] == 2)
             film->audio_type = CODEC_ID_ADPCM_ADX;
-        else if (film->audio_bits == 8)
-            film->audio_type = CODEC_ID_PCM_S8;
-        else if (film->audio_bits == 16)
-            film->audio_type = CODEC_ID_PCM_S16BE;
-        else
+        else if (film->audio_channels > 0) {
+            if (film->audio_bits == 8)
+                film->audio_type = CODEC_ID_PCM_S8;
+            else if (film->audio_bits == 16)
+                film->audio_type = CODEC_ID_PCM_S16BE;
+            else
+                film->audio_type = CODEC_ID_NONE;
+        } else
             film->audio_type = CODEC_ID_NONE;
     }
 



More information about the ffmpeg-cvslog mailing list