[FFmpeg-cvslog] avformat/mov: Fix deallocation when MOVStreamContext failed to allocate

Michael Niedermayer git at videolan.org
Sat Jul 18 20:46:09 CEST 2015


ffmpeg | branch: release/2.7 | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 14 14:14:16 2015 +0200| [a066b2ceddc64f8d3e8cb8eb8ee129714df302bd] | committer: Michael Niedermayer

avformat/mov: Fix deallocation when MOVStreamContext failed to allocate

Fixes: 260813283176b57b3c9974fe284eebc3_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 262144

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 15629129dde771446a005282ee33c4ea1199e696)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 5ea6932..b42537f 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3964,6 +3964,9 @@ static int mov_read_close(AVFormatContext *s)
         AVStream *st = s->streams[i];
         MOVStreamContext *sc = st->priv_data;
 
+        if (!sc)
+            continue;
+
         av_freep(&sc->ctts_data);
         for (j = 0; j < sc->drefs_count; j++) {
             av_freep(&sc->drefs[j].path);



More information about the ffmpeg-cvslog mailing list