| commit | d8cd71bb520bbe9c45f00da587abb333f216fa96 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Mon Apr 24 12:30:58 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 24 12:30:58 2023 +0000 |
| tree | dde42a16e82aa798bed2cd17877568084f1420c7 | |
| parent | 65e05cef95df53a132c4def4036e10e799c95511 [diff] | |
| parent | e64ff05250bdf09f4ce7d86adabb1f2ee57e8423 [diff] |
Merge "spatializer: fix resource leak when dlsym failed" am: abfb9a5429 am: 4dadb91305 am: 9fc0531731 am: e64ff05250 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2556331 Change-Id: I71f7aba5b39e76b725ea2156a58ba5c4ed1f139c 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);