diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-11 19:17:41 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-10-06 22:32:02 +0200 |
| commit | 790f4dd5c96f948a637a90899b5f6af34ccb3942 (patch) | |
| tree | c8ce34457bc89bec8eddecac92538229c66afc53 /libavformat/segafilm.c | |
| parent | 69a0bce753a5d5556d5bc0888afe390e22611dd8 (diff) | |
| download | ffmpeg-790f4dd5c96f948a637a90899b5f6af34ccb3942.tar.gz | |
Fixed segfault on corrupted sega streams in the demuxer.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'libavformat/segafilm.c')
| -rw-r--r-- | libavformat/segafilm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 81f04c6c01..32a979f1a3 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -176,6 +176,8 @@ static int film_read_header(AVFormatContext *s, if(film->sample_count >= UINT_MAX / sizeof(film_sample)) return -1; film->sample_table = av_malloc(film->sample_count * sizeof(film_sample)); + if (!film->sample_table) + return AVERROR(ENOMEM); for(i=0; i<s->nb_streams; i++) av_set_pts_info(s->streams[i], 33, 1, film->base_clock); @@ -199,7 +201,7 @@ static int film_read_header(AVFormatContext *s, if (film->audio_type == CODEC_ID_ADPCM_ADX) audio_frame_counter += (film->sample_table[i].sample_size * 32 / (18 * film->audio_channels)); - else + else if (film->audio_type != CODEC_ID_NONE) audio_frame_counter += (film->sample_table[i].sample_size / (film->audio_channels * film->audio_bits / 8)); } else { |