From 6f7f2396049575fcf2054b4dafa19ca01381638e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 28 Nov 2011 05:23:48 +0100 Subject: libnut: check for av_malloc failure. No, ive no testcase, i just spoted these when looking ... Signed-off-by: Michael Niedermayer --- libavformat/libnut.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libavformat/libnut.c') diff --git a/libavformat/libnut.c b/libavformat/libnut.c index eafe8165e2..9f64544d2a 100644 --- a/libavformat/libnut.c +++ b/libavformat/libnut.c @@ -71,6 +71,8 @@ static int nut_write_header(AVFormatContext * avf) { int i; priv->s = s = av_mallocz((avf->nb_streams + 1) * sizeof*s); + if(!s) + return AVERROR(ENOMEM); for (i = 0; i < avf->nb_streams; i++) { AVCodecContext * codec = avf->streams[i]->codec; @@ -224,6 +226,10 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { st->codec->extradata_size = s[i].codec_specific_len; if (st->codec->extradata_size) { st->codec->extradata = av_mallocz(st->codec->extradata_size); + if(!st->codec->extradata){ + nut_demuxer_uninit(nut); + return AVERROR(ENOMEM); + } memcpy(st->codec->extradata, s[i].codec_specific, st->codec->extradata_size); } -- cgit v1.2.3