[FFmpeg-cvslog] r18839 - trunk/libavcodec/vc1.c

[conrad]

Author: conrad
Date: Fri May 15 09:49:59 2009
New Revision: 18839

Log:
Ensure that we don't read from invalid memory with B-frame qpel

Modified:
   trunk/libavcodec/vc1.c

Modified: trunk/libavcodec/vc1.c
==============================================================================
--- trunk/libavcodec/vc1.c	Fri May 15 08:11:53 2009	(r18838)
+++ trunk/libavcodec/vc1.c	Fri May 15 09:49:59 2009	(r18839)
@@ -1818,8 +1818,8 @@ static void vc1_interp_mc(VC1Context *v)
     }
 
     if(v->rangeredfrm
-       || (unsigned)src_x > s->h_edge_pos - (mx&3) - 16
-       || (unsigned)src_y > s->v_edge_pos - (my&3) - 16){
+       || (unsigned)src_x > s->h_edge_pos - (mx&3) - 16 - s->mspel*3
+       || (unsigned)src_y > s->v_edge_pos - (my&3) - 16 - s->mspel*3){
         uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize;
 
         srcY -= s->mspel * (1 + s->linesize);