| commit | 9fc0531731cb3231df64fc8cbffec0b71520bd2f | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Mon Apr 24 11:01:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 24 11:01:12 2023 +0000 |
| tree | ab1a8d3c4993206afa113cf3d7539485cc45de48 | |
| parent | d03399ffd7683f87f78764f84b9463cbbeed6099 [diff] | |
| parent | 4dadb91305fa334e9985823702f2bd402e1a6597 [diff] |
Merge "spatializer: fix resource leak when dlsym failed" am: abfb9a5429 am: 4dadb91305 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2556331 Change-Id: I5e562e8ed1236a7b6d97998bf535b5a46b3b3bc9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libeffects/spatializer/benchmarks/spatializer_benchmark.cpp b/media/libeffects/spatializer/benchmarks/spatializer_benchmark.cpp index e8ac480..e2177db 100644 --- a/media/libeffects/spatializer/benchmarks/spatializer_benchmark.cpp +++ b/media/libeffects/spatializer/benchmarks/spatializer_benchmark.cpp
@@ -31,6 +31,7 @@ (audio_effect_library_t*)dlsym(effectLib, AUDIO_EFFECT_LIBRARY_INFO_SYM_AS_STR); if (effectInterface == nullptr) { ALOGE("dlsym failed: %s", dlerror()); + dlclose(effectLib); exit(-1); } symbol = (audio_effect_library_t)(*effectInterface);
diff --git a/media/libeffects/spatializer/tests/SpatializerTest.cpp b/media/libeffects/spatializer/tests/SpatializerTest.cpp index 110fbb1..3db42b6 100644 --- a/media/libeffects/spatializer/tests/SpatializerTest.cpp +++ b/media/libeffects/spatializer/tests/SpatializerTest.cpp
@@ -30,6 +30,7 @@ (audio_effect_library_t*)dlsym(effectLib, AUDIO_EFFECT_LIBRARY_INFO_SYM_AS_STR); if (effectInterface == nullptr) { ALOGE("dlsym failed: %s", dlerror()); + dlclose(effectLib); exit(-1); } symbol = (audio_effect_library_t)(*effectInterface);