From 62cbdd71eb2c0051cc5a9797db5ea82399337344 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 28 May 2012 17:08:06 +0200
Subject: [PATCH] yop: check for missing extradata
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 | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/yop.c b/libavcodec/yop.c
index 1eb76b128e..1adbd612ad 100644
--- a/libavcodec/yop.c
+++ b/libavcodec/yop.c
@@ -89,6 +89,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;
s->num_pal_colors = avctx->extradata[0];