diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-04-10 09:59:36 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-04-17 12:09:36 +0200 |
| commit | 34e6af9e204ca6bb18d8cf8ec68fe19b0e083e95 (patch) | |
| tree | 4310621e40953b876b97a98abf0985242868f9ca /libavcodec/indeo3.c | |
| parent | 66531d634e75b834e89e4a6a0f7470ca018712a1 (diff) | |
| download | ffmpeg-34e6af9e204ca6bb18d8cf8ec68fe19b0e083e95.tar.gz | |
indeo3: fix data size check
The data offsets are relative to the bistream header, which is 16 bytes
after the start of the data.
Fixes invalid reads with corrupted files.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
Diffstat (limited to 'libavcodec/indeo3.c')
| -rw-r--r-- | libavcodec/indeo3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 633bb300e9..004b618ff0 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -893,8 +893,7 @@ static int decode_frame_headers(Indeo3DecodeContext *ctx, AVCodecContext *avctx, if (ctx->data_size == 16) return 4; - if (ctx->data_size > buf_size) - ctx->data_size = buf_size; + ctx->data_size = FFMIN(ctx->data_size, buf_size - 16); bytestream2_skip(&gb, 3); // skip reserved byte and checksum |