commit bb9511684f70a735b3b909712666021e178c93e7
author Jerome Jiang <jianj@google.com> Sat Jun 15 00:34:40 2019
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jun 15 00:34:40 2019
tree c9202b779e953506e4a02e6832331159f253851a
parent 75b0abefd8ead6954cadf8e5bab498f39f25c846
parent c06a917501294f8845df580b114a13fce7269b2f

Merge "Fix memory leak for vp8 multi-res encoder."

vpx/src/vpx_encoder.c

diff --git a/vpx/src/vpx_encoder.c b/vpx/src/vpx_encoder.c
index 3385c22..f38577d 100644
--- a/vpx/src/vpx_encoder.c
+++ b/vpx/src/vpx_encoder.c
@@ -82,6 +82,9 @@
     res = VPX_CODEC_INCAPABLE;
   else {
     int i;
+#if CONFIG_MULTI_RES_ENCODING
+    int mem_loc_owned = 0;
+#endif
     void *mem_loc = NULL;
 
     if (iface->enc.mr_get_mem_loc == NULL) return VPX_CODEC_INCAPABLE;
@@ -129,13 +132,17 @@
             i--;
           }
 #if CONFIG_MULTI_RES_ENCODING
-          assert(mem_loc);
-          free(((LOWER_RES_FRAME_INFO *)mem_loc)->mb_info);
-          free(mem_loc);
+          if (!mem_loc_owned) {
+            assert(mem_loc);
+            free(((LOWER_RES_FRAME_INFO *)mem_loc)->mb_info);
+            free(mem_loc);
+          }
 #endif
           return SAVE_STATUS(ctx, res);
         }
-
+#if CONFIG_MULTI_RES_ENCODING
+        mem_loc_owned = 1;
+#endif
         ctx++;
         cfg++;
         dsf++;