commit c4f7d87fa4e288cbb6ae25c5551e55c17fa8aa1e
author Andy Hung <hunga@google.com> Wed Nov 20 20:29:32 2024 -0800
committer Andy Hung <hunga@google.com> Fri Dec 06 20:31:17 2024 -0800
tree e66b8b395424f5064784ca82c8d036246e205865
parent d0d2e85fec1038f664d51b61c05554abdcbe3ae0

AudioSystem: Ensure no nullptr access

Brute force nullptr check for safety. A warning is
issued if nullptr is found, but it should not occur.

Flag: EXEMPT bugfix
Test: for run in {1..100}; do (sleep 8; echo $run; adb shell pkill audioserver); done
Bug: 379427790
Change-Id: I3ba7a89ecfaf35b658de9477e3f27dc3a59352b2

media/libaudioclient/AudioSystem.cpp

diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index e3a96f5..8094d07 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -151,7 +151,11 @@
         {
             std::lock_guard l(mMutex);
             mValid = false;
-            mClient->clearIoCache();
+            if (mClient) {
+                mClient->clearIoCache();
+            } else {
+                ALOGW("%s: null client", __func__);
+            }
         }
         AudioSystem::reportError(DEAD_OBJECT);
     }
@@ -1004,7 +1008,11 @@
             mValid = false;
             client = mClient;
         }
-        client->onServiceDied();
+        if (client) {
+            client->onServiceDied();
+        } else {
+            ALOGW("%s: null client", __func__);
+        }
     }
 
     static constexpr mediautils::ServiceOptions options() {