OSDN Git Service

avcodec/h264: fix code that blindly dereferences NULL DPB
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Dec 2013 22:41:50 +0000 (23:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Dec 2013 22:50:08 +0000 (23:50 +0100)
Fixes mixed flushing and decoding NULL packets
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c

index 77a2657..0028227 100644 (file)
@@ -1851,7 +1851,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.buf[0] &&
+        if (h1->DPB && h1->DPB[i].f.buf[0] &&
             (ret = ref_picture(h, &h->DPB[i], &h1->DPB[i])) < 0)
             return ret;
     }