diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-28 07:37:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-28 07:37:12 +0200 |
| commit | d0dafebb753f34da61058adf956663de39a815b4 (patch) | |
| tree | bf71d7945ae5a879d1643d5d6ac87518c905cd43 | |
| parent | 11cc2092269a36dc7a98545397e110fa8c08e18a (diff) | |
| download | ffmpeg-d0dafebb753f34da61058adf956663de39a815b4.tar.gz | |
tm2: Fix overread of token array.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/truemotion2.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index e29845c088..28c712a0e4 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -339,8 +339,13 @@ static inline int GET_TOK(TM2Context *ctx,int type) { av_log(ctx->avctx, AV_LOG_ERROR, "Read token from stream %i out of bounds (%i>=%i)\n", type, ctx->tok_ptrs[type], ctx->tok_lens[type]); return 0; } - if(type <= TM2_MOT) + if(type <= TM2_MOT) { + if (ctx->tokens[type][ctx->tok_ptrs[type]] >= TM2_DELTAS) { + av_log(ctx->avctx, AV_LOG_ERROR, "token %d is too large\n", ctx->tokens[type][ctx->tok_ptrs[type]]); + return 0; + } return ctx->deltas[type][ctx->tokens[type][ctx->tok_ptrs[type]++]]; + } return ctx->tokens[type][ctx->tok_ptrs[type]++]; } |