yop: check for missing extradata
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 May 2012 15:08:06 +0000 (17:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Jun 2012 19:06:29 +0000 (21:06 +0200)
Fixes null ptr deref
Fixes Ticket1361

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 77a4c8b959fa9bc6bcaa42b40a0b046cdf3fec38)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/yop.c

index 45a3344..40d9f7a 100644 (file)
@@ -90,6 +90,11 @@ static av_cold int yop_decode_init(AVCodecContext *avctx)
         return -1;
     }
 
+    if (!avctx->extradata) {
+        av_log(avctx, AV_LOG_ERROR, "extradata missing\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     avctx->pix_fmt = PIX_FMT_PAL8;
 
     avcodec_get_frame_defaults(&s->frame);