From 2240e2078d53d3cfce8ff1dda64e58fa72038602 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 28 Nov 2013 10:54:35 +0100 Subject: truemotion1: check the header size Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org --- libavcodec/truemotion1.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libavcodec/truemotion1.c') diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index b1497d5011..270a030c33 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -323,6 +323,11 @@ static int truemotion1_decode_header(TrueMotion1Context *s) return AVERROR_INVALIDDATA; } + if (header.header_size + 1 > s->size) { + av_log(s->avctx, AV_LOG_ERROR, "Input packet too small.\n"); + return AVERROR_INVALIDDATA; + } + /* unscramble the header bytes with a XOR operation */ for (i = 1; i < header.header_size; i++) header_buffer[i - 1] = s->buf[i] ^ s->buf[i + 1]; -- cgit v1.2.3