diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-28 17:08:06 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-28 17:24:13 +0200 |
commit | 77a4c8b959fa9bc6bcaa42b40a0b046cdf3fec38 (patch) | |
tree | 2fbac6c50727da4f98b7293b1f994722955d6b5d /libavcodec | |
parent | 01900fcc45e99ee4556e0a5d87ff57b2f150dad4 (diff) | |
download | ffmpeg-77a4c8b959fa9bc6bcaa42b40a0b046cdf3fec38.tar.gz |
yop: check for missing extradata
Fixes null ptr deref
Fixes Ticket1361
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/yop.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 05abb24553..ac17297915 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; avcodec_get_frame_defaults(&s->frame); |