diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-14 14:14:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-14 14:15:42 +0200 |
| commit | 15629129dde771446a005282ee33c4ea1199e696 (patch) | |
| tree | fb8602865767296796deafeb0ada4026dd93b467 | |
| parent | 0ff4953e1be520afc3555d5b3f9629dc9509e46c (diff) | |
| download | ffmpeg-15629129dde771446a005282ee33c4ea1199e696.tar.gz | |
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@niedermayer.cc>
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index d1b29a2211..d24faa7b18 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3973,6 +3973,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); |