From 30bce34b6719ca99ad72c62e2fba3eade71f1eae Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 14 Nov 2012 19:15:32 +0100 Subject: [PATCH] vpriv_adx_decode_header: avoid underreading the array. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/adx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/adx.c b/libavcodec/adx.c index 870216c606..7da696d0a8 100644 --- a/libavcodec/adx.c +++ b/libavcodec/adx.c @@ -47,6 +47,11 @@ int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, return AVERROR_INVALIDDATA; offset = AV_RB16(buf + 2) + 4; + if (offset < 6) { + av_log(avctx, AV_LOG_ERROR, "offset is prior data\n"); + return AVERROR_INVALIDDATA; + } + /* if copyright string is within the provided data, validate it */ if (bufsize >= offset && memcmp(buf + offset - 6, "(c)CRI", 6)) return AVERROR_INVALIDDATA;