mov: Check memory allocation

Message ID 20150608120924.BDF515DD23@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau June 8, 2015, 12:09 p.m.
Module: libav
Branch: master
Commit: 6308cd4868d2bd5fdf8bfa8dd10856c9a91874f5

Author:    Vittorio Giovara <vittorio.giovara@gmail.com>
Committer: Vittorio Giovara <vittorio.giovara@gmail.com>
Date:      Wed Jun  3 14:16:49 2015 +0100

mov: Check memory allocation

CC: libav-stable@libav.org
Bug-Id: CID 1292518

---

 libavformat/mov.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 80681b7..f603446 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");