commit 8da941803bcf701730d869a5fe60a4851c858c07
author Shunkai Yao <yaoshunkai@google.com> Wed Feb 14 02:49:47 2024 +0000
committer Shunkai Yao <yaoshunkai@google.com> Wed Feb 14 18:22:05 2024 +0000
tree 80a5947b618778d26e4faff4d65c1cafd6134e88
parent f4a6c87cfdf2a11fc4bd74767ca4accc57094761

AudioFlinger: validate effect before access to avoid crash

Bug: 324834453
Test: atest CtsMediaAudioTestCases
Change-Id: Ia1de56763feefd79b5940cfd9082402fd084c78f

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index bdbd4d6..9d69284 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -4387,11 +4387,12 @@
 
     sp<IAfThreadBase> thread = getEffectThread_l(sessionId, effectId);
     if (thread == nullptr) {
-      return;
+        return;
     }
     audio_utils::lock_guard _sl(thread->mutex());
-    sp<IAfEffectModule> effect = thread->getEffect_l(sessionId, effectId);
-    thread->setEffectSuspended_l(&effect->desc().type, suspended, sessionId);
+    if (const auto& effect = thread->getEffect_l(sessionId, effectId)) {
+        thread->setEffectSuspended_l(&effect->desc().type, suspended, sessionId);
+    }
 }