From feb6a94f740bccc8e369f8b74714b940490f3901 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 13 Jul 2015 19:25:03 +0200 Subject: avutil/frame: fix crash with av_frame_unref(NULL) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- libavutil/frame.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavutil') diff --git a/libavutil/frame.c b/libavutil/frame.c index 4596927f97..4ae75ef5d2 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++) -- cgit v1.2.3