mov: Fix two memleaks

Message ID 20150531110524.91A785DCA9@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau May 31, 2015, 11:05 a.m.
Module: libav
Branch: master
Commit: f261a55d72753bcec33369954809732abae8f8f7

Author:    Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Committer: Luca Barbato <lu_zero@gentoo.org>
Date:      Tue May 26 14:24:36 2015 +0100

mov: Fix two memleaks

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

CC: libav-stable@libav.org

---

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

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 70fa1e0..33e1054 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1942,10 +1942,11 @@  static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 
     sc->sample_count = i;
 
+    av_free(buf);
+
     if (pb->eof_reached)
         return AVERROR_EOF;
 
-    av_free(buf);
     return 0;
 }
 
@@ -2028,6 +2029,8 @@  static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 
     av_log(c->fc, AV_LOG_TRACE, "track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries);
 
+    av_freep(&sc->ctts_data);
+
     if (!entries)
         return 0;
     if (entries >= UINT_MAX / sizeof(*sc->ctts_data))