From 6fb0f37defbf5b7969f949007d8ac96dfdd26b15 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 10 Dec 2013 23:41:50 +0100 Subject: [PATCH] avcodec/h264: fix code that blindly dereferences NULL DPB Fixes mixed flushing and decoding NULL packets Found-by: wm4 Signed-off-by: Michael Niedermayer (cherry picked from commit d9339ab55373b12f078a3e3f1e294d8ff78652dd) Conflicts: libavcodec/h264.c --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1b531f560b..1d2570be56 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1839,7 +1839,7 @@ static int decode_update_thread_context(AVCodecContext *dst, for (i = 0; h->DPB && i < MAX_PICTURE_COUNT; i++) { unref_picture(h, &h->DPB[i]); - if (h1->DPB[i].f.data[0] && + if (h1->DPB && h1->DPB[i].f.data[0] && (ret = ref_picture(h, &h->DPB[i], &h1->DPB[i])) < 0) return ret; }