aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-05-03 08:19:42 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2011-05-03 22:29:19 -0400
commit76432655056b9c1477ade550e4b6d277556eb6b2 (patch)
tree1306ab01f3be28ad3c2ee5489e724554204db33d
parentf8af93ab99a132c268e4ce83736762555e928b96 (diff)
downloadffmpeg-76432655056b9c1477ade550e4b6d277556eb6b2.tar.gz
nutenc: check malloc return values.
-rw-r--r--libavformat/nutenc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 4ca761ab40..85340b158e 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -588,6 +588,12 @@ static int write_header(AVFormatContext *s){
nut->chapter = av_mallocz(sizeof(ChapterContext)*s->nb_chapters);
nut->time_base= av_mallocz(sizeof(AVRational )*(s->nb_streams +
s->nb_chapters));
+ if (!nut->stream || (s->nb_chapters && !nut->chapter) || !nut->time_base) {
+ av_freep(&nut->stream);
+ av_freep(&nut->chapter);
+ av_freep(&nut->time_base);
+ return AVERROR(ENOMEM);
+ }
for(i=0; i<s->nb_streams; i++){
AVStream *st= s->streams[i];