generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

segafilm: Check for memory allocation failures in segafilm demuxer.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7cbe025758)
This commit is contained in:
Laurent Aimar
2011-09-12 20:58:35 +02:00
committed by Michael Niedermayer
parent ad6177e52c
commit 21587509ec
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/segafilm.c
View File

@@ -167,6 +167,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);
@@ -238,6 +240,10 @@ static int film_read_packet(AVFormatContext *s,
av_free(film->stereo_buffer); av_free(film->stereo_buffer);
film->stereo_buffer_size = sample->sample_size; film->stereo_buffer_size = sample->sample_size;
film->stereo_buffer = av_malloc(film->stereo_buffer_size); film->stereo_buffer = av_malloc(film->stereo_buffer_size);
if (!film->stereo_buffer) {
film->stereo_buffer_size = 0;
return AVERROR(ENOMEM);
}
} }
pkt->pos= avio_tell(pb); pkt->pos= avio_tell(pb);