shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9,encoder: check pointers before member access"

--- a/vp9/encoder/vp9_aq_cyclicrefresh.c

+++ b/vp9/encoder/vp9_aq_cyclicrefresh.c

@@ -52,9 +52,11 @@

 }

 void vp9_cyclic_refresh_free(CYCLIC_REFRESH *cr) {

-  vpx_free(cr->map);

-  vpx_free(cr->last_coded_q_map);

-  vpx_free(cr);

+  if (cr != NULL) {

+    vpx_free(cr->map);

+    vpx_free(cr->last_coded_q_map);

+    vpx_free(cr);

+  }

 }

 // Check if this coding block, of size bsize, should be considered for refresh

--- a/vp9/encoder/vp9_context_tree.c

+++ b/vp9/encoder/vp9_context_tree.c

@@ -139,17 +139,22 @@

 }

 void vp9_free_pc_tree(ThreadData *td) {

-  const int tree_nodes = 64 + 16 + 4 + 1;

   int i;

-  // Set up all 4x4 mode contexts

-  for (i = 0; i < 64; ++i) free_mode_context(&td->leaf_tree[i]);

+  if (td == NULL) return;

-  // Sets up all the leaf nodes in the tree.

-  for (i = 0; i < tree_nodes; ++i) free_tree_contexts(&td->pc_tree[i]);

+  if (td->leaf_tree != NULL) {

+    // Set up all 4x4 mode contexts

+    for (i = 0; i < 64; ++i) free_mode_context(&td->leaf_tree[i]);

+    vpx_free(td->leaf_tree);

+    td->leaf_tree = NULL;

+  }

-  vpx_free(td->pc_tree);

-  td->pc_tree = NULL;

-  vpx_free(td->leaf_tree);

-  td->leaf_tree = NULL;

+  if (td->pc_tree != NULL) {

+    const int tree_nodes = 64 + 16 + 4 + 1;

+    // Sets up all the leaf nodes in the tree.

+    for (i = 0; i < tree_nodes; ++i) free_tree_contexts(&td->pc_tree[i]);

+    vpx_free(td->pc_tree);

+    td->pc_tree = NULL;

+  }

 }