commit cccda0db727c2282375b174104294b40911d1447
author Hui Su <huisu@google.com> Mon Nov 20 13:46:00 2017 -0800
committer Hui Su <huisu@google.com> Mon Nov 20 13:46:00 2017 -0800
tree 160829ffa995e3ec436ee5a81218ec5f0676b26c
parent 75ff22f309de2e25477d336a6a8e9e58d3bb2272

Terminate decoding at invalid mode and ref frame combo

BUG=b/69488541

Change-Id: I2113bba4589f61a09d0dd07c64a522f4d0ae304b

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 6706abd..f8dd6d9 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -2347,6 +2347,12 @@
     }
   }
 
+  if (is_compound != is_inter_compound_mode(mbmi->mode)) {
+    aom_internal_error(&cm->error, AOM_CODEC_CORRUPT_FRAME,
+                       "Prediction mode %d invalid with ref frame %d %d",
+                       mbmi->mode, mbmi->ref_frame[0], mbmi->ref_frame[1]);
+  }
+
 #if CONFIG_EXT_INTER
   if ((bsize < BLOCK_8X8 && !unify_bsize) ||
       (mbmi->mode != ZEROMV && mbmi->mode != ZERO_ZEROMV))