diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 21:58:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 21:59:05 +0200 |
| commit | 9dd04f6d8cdd1c10c28b2cb4252c1a41df581915 (patch) | |
| tree | 9b86acc6559c9c5b20910a23e5f356c13d8e3f00 /libavcodec/sanm.c | |
| parent | ad002e1a13a8df934bd6cb2c84175a4780ab8942 (diff) | |
| download | ffmpeg-9dd04f6d8cdd1c10c28b2cb4252c1a41df581915.tar.gz | |
sanm: Check dimensions before use
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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index f217ef36bb..e6e866ef8e 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -732,6 +732,11 @@ static int process_frame_obj(SANMVideoContext *ctx) w = bytestream2_get_le16u(&ctx->gb); h = bytestream2_get_le16u(&ctx->gb); + if (!w || !h) { + av_log(ctx->avctx, AV_LOG_ERROR, "dimensions are invalid\n"); + return AVERROR_INVALIDDATA; + } + if (ctx->width < left + w || ctx->height < top + h) { if (av_image_check_size(FFMAX(left + w, ctx->width), FFMAX(top + h, ctx->height), 0, ctx->avctx) < 0) |