From ca9ab3fc46b2d3d839ff1e09660e83f146dd9a0b Mon Sep 17 00:00:00 2001 From: Jerome Jiang Date: Wed, 22 Aug 2018 11:01:37 -0700 Subject: [PATCH] Revert "vp8: Fix memory address overflow in decoder." This reverts commit 45cf384738ad261de7d00769c19b9b2842af06a7. BUG=875626,875680,webm:1496 Change-Id: I78037b5e57dbf6cfe326b29beaad1128868f09f2 --- vp8/decoder/threading.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index db17f8d1e..aadc8dc71 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -400,25 +400,16 @@ static void mt_decode_mb_rows(VP8D_COMP *pbi, MACROBLOCKD *xd, xd->dst.u_buffer = dst_buffer[1] + recon_uvoffset; xd->dst.v_buffer = dst_buffer[2] + recon_uvoffset; - if (!ref_fb_corrupted[xd->mode_info_context->mbmi.ref_frame]) { - xd->pre.y_buffer = - ref_buffer[xd->mode_info_context->mbmi.ref_frame][0] + - recon_yoffset; - xd->pre.u_buffer = - ref_buffer[xd->mode_info_context->mbmi.ref_frame][1] + - recon_uvoffset; - xd->pre.v_buffer = - ref_buffer[xd->mode_info_context->mbmi.ref_frame][2] + - recon_uvoffset; - } + xd->pre.y_buffer = + ref_buffer[xd->mode_info_context->mbmi.ref_frame][0] + recon_yoffset; + xd->pre.u_buffer = + ref_buffer[xd->mode_info_context->mbmi.ref_frame][1] + recon_uvoffset; + xd->pre.v_buffer = + ref_buffer[xd->mode_info_context->mbmi.ref_frame][2] + recon_uvoffset; /* propagate errors from reference frames */ xd->corrupted |= ref_fb_corrupted[xd->mode_info_context->mbmi.ref_frame]; - if (xd->corrupted) - vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME, - "Corrupted reference frame buffer"); - mt_decode_macroblock(pbi, xd, 0); xd->left_available = 1; -- 2.40.0