diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 01:09:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-03 02:41:07 +0100 |
| commit | 4f873341b4d522b1bfa385a1f6fc86bb8b6dc879 (patch) | |
| tree | 111f340adf4c0e262970fdd1933eb546b763d259 | |
| parent | 857a0379457ef79c1dc15d15b672e374d74dd6dc (diff) | |
| download | ffmpeg-4f873341b4d522b1bfa385a1f6fc86bb8b6dc879.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>
(cherry picked from commit 365270aec5c2b9284230abc702b11168818f14cf)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 21073e2344..1d5d064976 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -415,6 +415,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)) |