]> granicus.if.org Git - libvpx/commitdiff
Revert "vp8: Fix memory address overflow in decoder."
authorJerome Jiang <jianj@google.com>
Wed, 22 Aug 2018 18:01:37 +0000 (11:01 -0700)
committerJerome Jiang <jianj@google.com>
Wed, 22 Aug 2018 18:03:32 +0000 (11:03 -0700)
This reverts commit 45cf384738ad261de7d00769c19b9b2842af06a7.

BUG=875626,875680,webm:1496

Change-Id: I78037b5e57dbf6cfe326b29beaad1128868f09f2

vp8/decoder/threading.c

index db17f8d1eed6d2547e4d292b55fa4f9e264f8ef9..aadc8dc712f89391b47a74e2b01530db5a3cb32e 100644 (file)
@@ -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;