From b336daa952d9d0ff3e1fd9f9aeb12b42f5d89b26 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 31 Oct 2013 20:17:18 +0100 Subject: [PATCH] Fix a crash on oom when decoding hevc. (cherry picked from commit 5ab1efb9d0dc65e748a0291b67915e35578b302e) Signed-off-by: Michael Niedermayer --- libavcodec/hevc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 8ff51a3130..2b57d13fb6 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2604,7 +2604,8 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) pic_arrays_free(s); - av_freep(&lc->edge_emu_buffer); + if (lc) + av_freep(&lc->edge_emu_buffer); av_freep(&s->md5_ctx); for(i=0; i < s->nals_allocated; i++) { -- 2.11.0