virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

Fixed segfault on corrupted sega streams in the demuxer.

Browse Source 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
This commit is contained in:
Laurent Aimar 2011-09-11 19:17:41 +02:00 committed by Janne Grunau
parent 69a0bce753
commit 790f4dd5c9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/segafilm.c
View File

@ -176,6 +176,8 @@ static int film_read_header(AVFormatContext *s,
if(film->sample_count >= UINT_MAX / sizeof(film_sample)) if(film->sample_count >= UINT_MAX / sizeof(film_sample))
return -1; return -1;
film->sample_table = av_malloc(film->sample_count * sizeof(film_sample)); 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++) for(i=0; i<s->nb_streams; i++)
av_set_pts_info(s->streams[i], 33, 1, film->base_clock); 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) if (film->audio_type == CODEC_ID_ADPCM_ADX)
audio_frame_counter += (film->sample_table[i].sample_size * 32 / audio_frame_counter += (film->sample_table[i].sample_size * 32 /
(18 * film->audio_channels)); (18 * film->audio_channels));
else else if (film->audio_type != CODEC_ID_NONE)
audio_frame_counter += (film->sample_table[i].sample_size / audio_frame_counter += (film->sample_table[i].sample_size /
(film->audio_channels * film->audio_bits / 8)); (film->audio_channels * film->audio_bits / 8));
} else { } else {