ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Mon Jul 13 19:25:03 2015 +0200| [feb6a94f740bccc8e369f8b74714b940490f3901] | committer: Michael Niedermayer
avutil/frame: fix crash with av_frame_unref(NULL) Fixes: af94b3a3d26586c08f557cafe8246251_signal_sigsegv_7ffff713351a_343_XFMode.ASF with 2097152 alloc limit 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=feb6a94f740bccc8e369f8b74714b940490f3901 --- libavutil/frame.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index 4596927..4ae75ef 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -463,6 +463,9 @@ void av_frame_unref(AVFrame *frame) { int i; + if (!frame) + return; + wipe_side_data(frame); for (i = 0; i < FF_ARRAY_ELEMS(frame->buf); i++) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog