From e08ec714801a8f8e72eeee57c2df48b8fbaf2e12 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 30 Jul 2010 18:34:39 +0000 Subject: [PATCH] Add 2 failed memory allocation checks Originally committed as revision 24598 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/flacenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 9877a83..31332a6 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -404,6 +404,8 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) av_md5_init(s->md5ctx); streaminfo = av_malloc(FLAC_STREAMINFO_SIZE); + if (!streaminfo) + return AVERROR(ENOMEM); write_streaminfo(s, streaminfo); avctx->extradata = streaminfo; avctx->extradata_size = FLAC_STREAMINFO_SIZE; @@ -412,6 +414,8 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) s->min_framesize = s->max_framesize; avctx->coded_frame = avcodec_alloc_frame(); + if (!avctx->coded_frame) + return AVERROR(ENOMEM); avctx->coded_frame->key_frame = 1; return 0; -- 2.7.4