mov: Check memory allocation
authorVittorio Giovara <vittorio.giovara@gmail.com>
Wed, 3 Jun 2015 13:16:49 +0000 (14:16 +0100)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Mon, 8 Jun 2015 12:03:39 +0000 (13:03 +0100)
CC: libav-stable@libav.org
Bug-Id: CID 1292518

libavformat/mov.c

index 80681b7..f603446 100644 (file)
@@ -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");