| commit | ac77b699e43d223b79c7e84efcd73190ea00ea23 | [log] [tgz] |
|---|---|---|
| author | David Li <dvdli@google.com> | Mon Mar 22 11:03:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 11:03:50 2021 +0000 |
| tree | 9d1b16289904655b9dc7cbd9f74893f7f01011aa | |
| parent | 694d2be17e4dce365e0e9fc070e4485c1e06b6bc [diff] | |
| parent | 5809caff94f4b05a59f887ad65b9e88f2ab35e0c [diff] |
Merge "fix null dereference on aeli" am: 00112c5a0a am: 06b7deb347 am: 5809caff94 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1646947 Change-Id: Id1535f29a43980bab3117587ffe83b22584a102d
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;