[libav-stable] indeo3: fix data size check

Anton Khirnov git at libav.org
Wed Apr 17 12:22:34 CEST 2013


Module: libav
Branch: master
Commit: 34e6af9e204ca6bb18d8cf8ec68fe19b0e083e95

Author:    Anton Khirnov <anton at khirnov.net>
Committer: Anton Khirnov <anton at khirnov.net>
Date:      Wed Apr 10 09:59:36 2013 +0200

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 at libav.org

---

 libavcodec/indeo3.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 633bb30..004b618 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
 



More information about the libav-stable mailing list