commit f2e7b9385ce2056570fc107dbdb6472d56b51e91
author Debargha Mukherjee <debargha@google.com> Tue May 02 21:45:39 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Wed May 03 13:32:48 2017 +0000
tree 41b4d5592331ded9aee875e42a661cdc1ca2ff0e
parent cfc12f384b401f0c7a1ad24250a8b521a601332b

Fix a out-of-bounds access issue

BUG=aomedia:489

Change-Id: Icff4dc0b5aeb6f674044382307469d8a406080cb

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 29f206a..a1096f7 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -11315,10 +11315,12 @@
                                               cm->allow_high_precision_mv,
                                               bsize, mi_col, mi_row, 0)
                              .as_int;
-      zeromv[1].as_int = gm_get_motion_vector(&cm->global_motion[refs[1]],
-                                              cm->allow_high_precision_mv,
-                                              bsize, mi_col, mi_row, 0)
-                             .as_int;
+      zeromv[1].as_int = (refs[1] != NONE_FRAME)
+                             ? gm_get_motion_vector(&cm->global_motion[refs[1]],
+                                                    cm->allow_high_precision_mv,
+                                                    bsize, mi_col, mi_row, 0)
+                                   .as_int
+                             : 0;
       lower_mv_precision(&zeromv[0].as_mv, cm->allow_high_precision_mv);
       lower_mv_precision(&zeromv[1].as_mv, cm->allow_high_precision_mv);
 #else