From 1875387a423561f142d2e5148f02c766f440ebea Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 12 Nov 2013 16:11:42 +0100 Subject: [PATCH] mpegvideo_motion: Handle edge emulation even without unrestricted_mv Fix out of bounds read. Bug-Id: 959 Found by: F4B3CD@STARLAB and Agostino Sarubbo Signed-off-by: Vittorio Giovara (cherry picked from commit 136f55207521f0b03194ef5b55ba70f1635d6aee) Signed-off-by: Diego Biurrun Gbp-Pq: Name mpegvideo_motion-Handle-edge-emulation-even-without-.patch --- libavcodec/mpegvideo_motion.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index f33db34..a3cba98 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -209,17 +209,14 @@ static inline int hpel_motion(MpegEncContext *s, dxy |= (motion_y & 1) << 1; src += src_y * s->linesize + src_x; - if (s->unrestricted_mv) { - if ((unsigned)src_x > FFMAX(s->h_edge_pos - (motion_x & 1) - 8, 0) || - (unsigned)src_y > FFMAX(s->v_edge_pos - (motion_y & 1) - 8, 0)) { - s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src, - s->linesize, s->linesize, - 9, 9, - src_x, src_y, s->h_edge_pos, - s->v_edge_pos); - src = s->edge_emu_buffer; - emu = 1; - } + if ((unsigned)src_x > FFMAX(s->h_edge_pos - (motion_x & 1) - 8, 0) || + (unsigned)src_y > FFMAX(s->v_edge_pos - (motion_y & 1) - 8, 0)) { + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src, + s->linesize, s->linesize, + 9, 9, src_x, src_y, + s->h_edge_pos, s->v_edge_pos); + src = s->edge_emu_buffer; + emu = 1; } pix_op[dxy](dest, src, s->linesize, 8); return emu; -- 2.30.2