av1_alloc_pc_tree_node: fix allocation check
Previously the code would use an uninitialized error variable which
could cause the code to jump to an arbitrary location on failure. The
code will still crash with this change; the allocation failure needs to
be propagated. This is left to a follow up given the call sites may be
in different threads and not have a way to exit gracefully currently.
Bug: aomedia:3276
Change-Id: Ib5d6e0ebdde563e465f92eea4218d9515ae3b2e1
diff --git a/av1/encoder/context_tree.c b/av1/encoder/context_tree.c
index f328745..1975e6a 100644
--- a/av1/encoder/context_tree.c
+++ b/av1/encoder/context_tree.c
@@ -150,10 +150,8 @@
}
PC_TREE *av1_alloc_pc_tree_node(BLOCK_SIZE bsize) {
- PC_TREE *pc_tree = NULL;
- struct aom_internal_error_info error;
-
- AOM_CHECK_MEM_ERROR(&error, pc_tree, aom_calloc(1, sizeof(*pc_tree)));
+ PC_TREE *pc_tree = aom_calloc(1, sizeof(*pc_tree));
+ if (pc_tree == NULL) return NULL;
pc_tree->partitioning = PARTITION_NONE;
pc_tree->block_size = bsize;
