diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-10-31 20:17:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 17:20:19 +0100 |
| commit | b336daa952d9d0ff3e1fd9f9aeb12b42f5d89b26 (patch) | |
| tree | 63f14fdb25c56addca3a9cd9f5485d1621b37e66 | |
| parent | a0aa5c34a964ed74217d4e7908ec4bf9536876d6 (diff) | |
| download | ffmpeg-b336daa952d9d0ff3e1fd9f9aeb12b42f5d89b26.tar.gz | |
Fix a crash on oom when decoding hevc.
(cherry picked from commit 5ab1efb9d0dc65e748a0291b67915e35578b302e)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc.c | 3 |
1 files changed, 2 insertions, 1 deletions
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++) { |