[FFmpeg-cvslog] mov: avoid a memleak when multiple stss boxes are present

Anton Khirnov git at videolan.org
Sat Dec 20 12:58:19 CET 2014


ffmpeg | branch: release/2.2 | Anton Khirnov <anton at khirnov.net> | Tue Aug 12 14:39:10 2014 +0000| [931f5b235112f1c2a09dead36f0a228061d23942] | committer: Anton Khirnov

mov: avoid a memleak when multiple stss boxes are present

CC: libav-stable at libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 64f7575fbd64e5b65d5c644347408588c776f1fe)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 577f1feb3fd1e51fd14af7ce6d79d468faa3b929)
Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

 libavformat/mov.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6f72ce8..5ef343e 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1598,6 +1598,7 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     }
     if (entries >= UINT_MAX / sizeof(int))
         return AVERROR_INVALIDDATA;
+    av_freep(&sc->keyframes);
     sc->keyframes = av_malloc(entries * sizeof(int));
     if (!sc->keyframes)
         return AVERROR(ENOMEM);



More information about the ffmpeg-cvslog mailing list