From 6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Wed, 3 Jun 2015 14:16:49 +0100 Subject: mov: Check memory allocation CC: libav-stable@libav.org Bug-Id: CID 1292518 --- libavformat/mov.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libavformat/mov.c') diff --git a/libavformat/mov.c b/libavformat/mov.c index 80681b7da7..f603446d98 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1661,7 +1661,11 @@ static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb, switch (st->codec->codec_id) { #if CONFIG_DV_DEMUXER case AV_CODEC_ID_DVAUDIO: - c->dv_fctx = avformat_alloc_context(); + c->dv_fctx = avformat_alloc_context(); + if (!c->dv_fctx) { + av_log(c->fc, AV_LOG_ERROR, "dv demux context alloc error\n"); + return AVERROR(ENOMEM); + } c->dv_demux = avpriv_dv_init_demux(c->dv_fctx); if (!c->dv_demux) { av_log(c->fc, AV_LOG_ERROR, "dv demux context init error\n"); -- cgit v1.2.3