commit d0cac70b542c38accd916f8afd13592d34c48963
author chiyotsai <chiyotsai@google.com> Fri Apr 02 14:24:32 2021 -0700
committer Chi Yo Tsai <chiyotsai@google.com> Wed Apr 07 19:49:31 2021 +0000
tree e4f684b25638fd4898f8b4380b392b09034766d1
parent 3a8d2140c5f7ede00a2968073e7f91211498c877

Fix a free on invalid ptr when img allocation fails

BUG=aomedia:2998

Change-Id: Ib1eda3b2379fb32f0cdbbf6e7938966efdb2bab9

aom/src/aom_image.c

diff --git a/aom/src/aom_image.c b/aom/src/aom_image.c
index dfdee87..13f71b2 100644
--- a/aom/src/aom_image.c
+++ b/aom/src/aom_image.c
@@ -38,6 +38,8 @@
   unsigned int h, w, s, xcs, ycs, bps, bit_depth;
   unsigned int stride_in_bytes;
 
+  if (img != NULL) memset(img, 0, sizeof(aom_image_t));
+
   /* Treat align==0 like align==1 */
   if (!buf_align) buf_align = 1;
 
@@ -111,8 +113,6 @@
     if (!img) goto fail;
 
     img->self_allocd = 1;
-  } else {
-    memset(img, 0, sizeof(aom_image_t));
   }
 
   img->img_data = img_data;