From 928dc49d0e37db50a9d1359ef910cb1856aabfaf Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Fri, 7 Jul 2006 04:50:13 +0000 Subject: [PATCH] Don't read out-of-bounds values. Originally committed as revision 5650 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/vc1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index e3b9834a883..4975e55c890 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -2511,7 +2511,8 @@ static int vc1_decode_p_mb(VC1Context *v, DCTELEM block[6][64]) int intrapred = 0; for(i=0; i<6; i++) if(is_intra[i]) { - if(v->mb_type[0][s->block_index[i] - s->block_wrap[i]] || v->mb_type[0][s->block_index[i] - 1]) { + if(((s->mb_y || (i==2 || i==3)) && v->mb_type[0][s->block_index[i] - s->block_wrap[i]]) + || ((s->mb_x || (i==1 || i==3)) && v->mb_type[0][s->block_index[i] - 1])) { intrapred = 1; break; } -- 2.39.2