[FFmpeg-cvslog] Fix a crash on oom when decoding hevc.

Carl Eugen Hoyos git at videolan.org
Mon Jan 13 17:28:59 CET 2014


ffmpeg | branch: release/2.1 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Oct 31 20:17:18 2013 +0100| [b336daa952d9d0ff3e1fd9f9aeb12b42f5d89b26] | committer: Michael Niedermayer

Fix a crash on oom when decoding hevc.
(cherry picked from commit 5ab1efb9d0dc65e748a0291b67915e35578b302e)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b336daa952d9d0ff3e1fd9f9aeb12b42f5d89b26
---

 libavcodec/hevc.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 8ff51a3..2b57d13 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++) {



More information about the ffmpeg-cvslog mailing list