commit f0602bba77d9ea0afa92cc9a5328feff56e8f49c
author Yaowu Xu <yaowu@google.com> Wed Dec 14 09:30:03 2016 -0800
committer Yaowu Xu <yaowu@google.com> Wed Dec 14 19:09:41 2016 +0000
tree 795156d8182bb12448ee780537b7a6c32300fc5f
parent 025b25459de616c17d877e46ea5eacbca66de753

Prevent null pointer de-referencing

Change-Id: If56a76cee9a5f9ad985019e7059e422445bdab51

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index b6c8438..564e41a 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -594,7 +594,9 @@
     const POSITION *const mv_ref = &mv_ref_search[i];
     if (is_inside(tile, mi_col, mi_row, mv_ref)) {
       const MB_MODE_INFO *const candidate =
-          &xd->mi[mv_ref->col + mv_ref->row * xd->mi_stride]->mbmi;
+          !xd->mi[mv_ref->col + mv_ref->row * xd->mi_stride]
+              ? NULL
+              : &xd->mi[mv_ref->col + mv_ref->row * xd->mi_stride]->mbmi;
 #if CONFIG_REF_MV
       if (candidate == NULL) continue;
       if ((mi_row % MAX_MIB_SIZE) + mv_ref->row >= MAX_MIB_SIZE ||
@@ -646,7 +648,9 @@
       const POSITION *mv_ref = &mv_ref_search[i];
       if (is_inside(tile, mi_col, mi_row, mv_ref)) {
         const MB_MODE_INFO *const candidate =
-            &xd->mi[mv_ref->col + mv_ref->row * xd->mi_stride]->mbmi;
+            !xd->mi[mv_ref->col + mv_ref->row * xd->mi_stride]
+                ? NULL
+                : &xd->mi[mv_ref->col + mv_ref->row * xd->mi_stride]->mbmi;
 #if CONFIG_REF_MV
         if (candidate == NULL) continue;
         if ((mi_row % MAX_MIB_SIZE) + mv_ref->row >= MAX_MIB_SIZE ||