ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Tue Jul 14 12:40:04 2015 +0200| [bd27dc910248a5da1ac187ac0dd1d1e22bc54a04] | committer: Michael Niedermayer
ffmpeg: Fix deallocating input threads with partly failed file allocation Fixes: 18615ff56beedc63a884a8db0678b47c_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 524288 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd27dc910248a5da1ac187ac0dd1d1e22bc54a04 --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index b11afc2..cff9dbc 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3529,7 +3529,7 @@ static void free_input_threads(void) InputFile *f = input_files[i]; AVPacket pkt; - if (!f->in_thread_queue) + if (!f || !f->in_thread_queue) continue; av_thread_message_queue_set_err_send(f->in_thread_queue, AVERROR_EOF); while (av_thread_message_queue_recv(f->in_thread_queue, &pkt, 0) >= 0) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
