From 21587509ec54da2b7dbd4309d971b728ed3d1e17 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Mon, 12 Sep 2011 20:58:35 +0200 Subject: [PATCH] segafilm: Check for memory allocation failures in segafilm demuxer. Signed-off-by: Michael Niedermayer (cherry picked from commit 7cbe02575868e7d25acf3d319ece664702700f0a) --- libavformat/segafilm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index ae194d496b..e712ebfbb1 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -167,6 +167,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; inb_streams; i++) 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); film->stereo_buffer_size = sample->sample_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);