diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 01:09:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 01:15:57 +0100 |
| commit | 365270aec5c2b9284230abc702b11168818f14cf (patch) | |
| tree | 74535e05ca0e9ce1f66557cf6526d16d96318097 /libavcodec/sanm.c | |
| parent | 3b1f037df56b483f64c57c5d95369f461d99a4fa (diff) | |
| download | ffmpeg-365270aec5c2b9284230abc702b11168818f14cf.tar.gz | |
sanm: add forgotten check for decoded_size in old_codec37()
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sanm.c')
| -rw-r--r-- | libavcodec/sanm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 101a843939..ec013511c8 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -417,6 +417,11 @@ static int old_codec37(SANMVideoContext *ctx, int top, flags = bytestream2_get_byte(&ctx->gb); bytestream2_skip(&ctx->gb, 3); + if (decoded_size > height * stride - left - top * stride) { + decoded_size = height * stride - left - top * stride; + av_log(ctx->avctx, AV_LOG_WARNING, "decoded size is too large\n"); + } + ctx->rotate_code = 0; if (((seq & 1) || !(flags & 1)) && (compr && compr != 2)) |