commit ccc1036484c7011404b72bf2627226fcf0682ce1
author James Zern <jzern@google.com> Thu Apr 28 12:54:06 2022 -0700
committer James Zern <jzern@google.com> Thu May 05 12:27:31 2022 -0700
tree f4dead3412d0774f0b175ca64ebd7869b7439e48
parent 481cc4be3f1ac4547378923313ee89a1cc33617d

av1_create_compressor: add missing alloc check

+ normalize error return to NULL from 0

Bug: aomedia:3276
Change-Id: Ib1c8e115901a60d3fdaa762e322ff7687268520e

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index ca85931..a4856cc 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -1237,6 +1237,10 @@
 #if CONFIG_FRAME_PARALLEL_ENCODE
   cm->error =
       (struct aom_internal_error_info *)aom_calloc(1, sizeof(*cm->error));
+  if (!cm->error) {
+    aom_free(cpi);
+    return NULL;
+  }
 #else
   cm->error = &ppi->error;
 #endif  // CONFIG_FRAME_PARALLEL_ENCODE
@@ -1247,7 +1251,7 @@
   if (setjmp(cm->error->jmp)) {
     cm->error->setjmp = 0;
     av1_remove_compressor(cpi);
-    return 0;
+    return NULL;
   }
 
   cm->error->setjmp = 1;