From 8540dcfd7af14da4080770dfbfa997cffdd0878b Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sat, 26 Nov 2011 20:59:17 +0000 Subject: [PATCH] snow: fix integer overflows The way these values are used, they should have an unsigned type. A similar change was made for mpegvideo in cb66847. Signed-off-by: Mans Rullgard --- libavcodec/snow.h | 4 ++-- libavcodec/snowenc.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/snow.h b/libavcodec/snow.h index f43deb1d72..bd54994b5b 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -154,8 +154,8 @@ typedef struct SnowContext{ Plane plane[MAX_PLANES]; BlockNode *block; #define ME_CACHE_SIZE 1024 - int me_cache[ME_CACHE_SIZE]; - int me_cache_generation; + unsigned me_cache[ME_CACHE_SIZE]; + unsigned me_cache_generation; slice_buffer sb; int memc_only; diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 4926eef5d2..cd60c3a512 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -958,7 +958,8 @@ static av_always_inline int check_block(SnowContext *s, int mb_x, int mb_y, int const int b_stride= s->b_width << s->block_max_depth; BlockNode *block= &s->block[mb_x + mb_y * b_stride]; BlockNode backup= *block; - int rd, index, value; + unsigned value; + int rd, index; assert(mb_x>=0 && mb_y>=0); assert(mb_xb_width << s->block_max_depth; BlockNode *block= &s->block[mb_x + mb_y * b_stride]; BlockNode backup[4]= {block[0], block[1], block[b_stride], block[b_stride+1]}; - int rd, index, value; + unsigned value; + int rd, index; assert(mb_x>=0 && mb_y>=0); assert(mb_x