commit d6f8b65417f2170829a774ce07df7fdd34b32367
author Laurent Aimar <fenrir@videolan.org> Mon Sep 12 20:58:35 2011 +0200
committer Michael Niedermayer <michaelni@gmx.at> Thu Nov 03 03:52:55 2011 +0100
tree 951901237e7c834ea780bc1ed2780ef579b71728
parent d8439f045220119d718968cf1023f5cd8182f877

segafilm: Check for memory allocation failures in segafilm demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7cbe02575868e7d25acf3d319ece664702700f0a)

libavformat/segafilm.c

diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index ae1263c..b802b33 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -167,6 +167,8 @@
     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);
@@ -238,6 +240,10 @@
             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= url_ftell(pb);