diff options
| author | Aneesh Dogra <lionaneesh@gmail.com> | 2011-11-29 23:13:35 +0530 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2011-11-29 09:58:05 -0800 |
| commit | 464ccb01447b91717cf580b870e636514701ce4f (patch) | |
| tree | 897cc2883b9a71aff0a5d4d1971ad4b3af5162c5 | |
| parent | fdab793a464c475ddb77e6cf7ae47a895bcf35fd (diff) | |
| download | ffmpeg-464ccb01447b91717cf580b870e636514701ce4f.tar.gz | |
indeo3: check per-plane data buffer against input buffer bounds.
Fixes : http://bugzilla.libav.org/show_bug.cgi?id=102
Signed-off-by: Alex Converse <alex.converse@gmail.com>
| -rw-r--r-- | libavcodec/indeo3.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 4f3cb36606..46efbd86d2 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -804,8 +804,10 @@ static int decode_plane(Indeo3DecodeContext *ctx, AVCodecContext *avctx, num_vectors = bytestream_get_le32(&data); ctx->mc_vectors = num_vectors ? data : 0; + if (num_vectors * 2 >= data_size) + return AVERROR_INVALIDDATA; /* init the bitreader */ - init_get_bits(&ctx->gb, &data[num_vectors * 2], data_size << 3); + init_get_bits(&ctx->gb, &data[num_vectors * 2], (data_size - num_vectors * 2) << 3); ctx->skip_bits = 0; ctx->need_resync = 0; |