| commit | 06b7deb347af6e7665b3580fe950d7fdb26f759f | [log] [tgz] |
|---|---|---|
| author | David Li <dvdli@google.com> | Mon Mar 22 02:29:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 02:29:40 2021 +0000 |
| tree | ee5bb356ea67cde0d5f23f9195fd4fa55980849f | |
| parent | 2a4c6ec138b1496809e23032ea7b83c1e2d11c52 [diff] | |
| parent | 00112c5a0aa6834b17ea3d6a84f4ccaeb764a465 [diff] |
Merge "fix null dereference on aeli" am: 00112c5a0a Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1646947 Change-Id: I1bb8ff6be0f9880e32c2c2bbce411d284e6cc4ef
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;