commit 15f9e4b5ca3175616c5f98b869835ea4b679178e
author Mufaddal Chakera <mufaddal.chakera@ittiam.com> Sun Mar 29 12:29:12 2020 +0530
committer Mufaddal Chakera <mufaddal.chakera@ittiam.com> Sun Mar 29 09:22:19 2020 +0000
tree 355067d4339a6ad104c49729e47727078fc6df70
parent e9a58bbe06681d0a14784d0720c1117a6cb7e9b3

Fix null pointer access in av1_setup_pc_tree

Fixed a null pointer access in av1_setup_pc_tree in the case
of firstpass/LAP stage when CONFIG_INTERNAL_STATS is enabled.

Change-Id: Ic1b2fb8263d9ac28db3d9b420b29c09dc35956dd

av1/encoder/context_tree.c

diff --git a/av1/encoder/context_tree.c b/av1/encoder/context_tree.c
index 78ccd4f..5544ce9 100644
--- a/av1/encoder/context_tree.c
+++ b/av1/encoder/context_tree.c
@@ -205,12 +205,14 @@
 #if CONFIG_INTERNAL_STATS
   td->pc_root[i]->none.best_mode_index = THR_INVALID;
 #endif  // CONFIG_INTERNAL_STATS
-  // Set up the root nodes for the rest of the possible superblock sizes
-  while (--i >= 0) {
-    td->pc_root[i] = td->pc_root[i + 1]->split[0];
+  if (!stat_generation_stage) {
+    // Set up the root nodes for the rest of the possible superblock sizes
+    while (--i >= 0) {
+      td->pc_root[i] = td->pc_root[i + 1]->split[0];
 #if CONFIG_INTERNAL_STATS
-    td->pc_root[i]->none.best_mode_index = THR_INVALID;
+      td->pc_root[i]->none.best_mode_index = THR_INVALID;
 #endif  // CONFIG_INTERNAL_STATS
+    }
   }
 }