commit 00112c5a0aa6834b17ea3d6a84f4ccaeb764a465
author David Li <dvdli@google.com> Mon Mar 22 02:07:17 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 22 02:07:17 2021 +0000
tree ee5bb356ea67cde0d5f23f9195fd4fa55980849f
parent 7a9d8d6069a44a9ab468156e88f1dc8292a865aa
parent 3b247167c6d10ba17ea49b073b45c1747c8ac92a

Merge "fix null dereference on aeli"

media/libeffects/proxy/EffectProxy.cpp

diff --git a/media/libeffects/proxy/EffectProxy.cpp b/media/libeffects/proxy/EffectProxy.cpp
index c010d68..be9f8c0 100644
--- a/media/libeffects/proxy/EffectProxy.cpp
+++ b/media/libeffects/proxy/EffectProxy.cpp
@@ -116,6 +116,16 @@
         pContext->sube[SUB_FX_OFFLOAD] = sube[1];
         pContext->desc[SUB_FX_OFFLOAD] = desc[1];
         pContext->aeli[SUB_FX_OFFLOAD] = aeli[1];
+    } else {
+        ALOGE("Both effects have (or don't have) EFFECT_FLAG_HW_ACC_TUNNEL flag");
+        delete[] sube;
+        delete[] desc;
+        delete[] aeli;
+        delete[] pContext->sube;
+        delete[] pContext->desc;
+        delete[] pContext->aeli;
+        delete pContext;
+        return -EINVAL;
     }
     delete[] desc;
     delete[] aeli;