[FFmpeg-cvslog] mov: fix two memleaks

Andreas Cadhalpun git at videolan.org
Sun May 24 15:10:07 CEST 2015


ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Sat May 23 23:35:42 2015 +0200| [8e77f8ab4abc199a5cc9d6c2c206b73fc2921af0] | committer: Andreas Cadhalpun

mov: fix two memleaks

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e77f8ab4abc199a5cc9d6c2c206b73fc2921af0
---

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index f6f07be..ae4f2cd 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2175,10 +2175,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;
 }
 
@@ -2286,6 +2287,7 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         return 0;
     if (entries >= UINT_MAX / sizeof(*sc->ctts_data))
         return AVERROR_INVALIDDATA;
+    av_freep(&sc->ctts_data);
     sc->ctts_data = av_malloc(entries * sizeof(*sc->ctts_data));
     if (!sc->ctts_data)
         return AVERROR(ENOMEM);



More information about the ffmpeg-cvslog mailing list