diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 02:03:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 02:04:24 +0100 |
| commit | 5260edee7e5bd975837696c8c8c1a80eb2fbd7c1 (patch) | |
| tree | bfc16bad9e749d418e5920ec44e8cb6b933d4f3a /libavcodec/sanm.c | |
| parent | 4ee88db840b3b53322e49aa8a993e227d744a1e8 (diff) | |
| download | ffmpeg-5260edee7e5bd975837696c8c8c1a80eb2fbd7c1.tar.gz | |
sanm: Use the correct height variable in the decoded_size checks
Fixes integer overflow and 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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 500c01f37c..caeaa366a6 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -420,8 +420,8 @@ 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; + if (decoded_size > ctx->height * stride - left - top * stride) { + decoded_size = ctx->height * stride - left - top * stride; av_log(ctx->avctx, AV_LOG_WARNING, "decoded size is too large\n"); } @@ -658,8 +658,8 @@ static int old_codec47(SANMVideoContext *ctx, int top, decoded_size = bytestream2_get_le32(&ctx->gb); bytestream2_skip(&ctx->gb, 8); - if (decoded_size > height * stride - left - top * stride) { - decoded_size = height * stride - left - top * stride; + if (decoded_size > ctx->height * stride - left - top * stride) { + decoded_size = ctx->height * stride - left - top * stride; av_log(ctx->avctx, AV_LOG_WARNING, "decoded size is too large\n"); } |