commit 9891efe1e9479f3f8a05762825ee7a4297cc2069
author Shraddha Basantwani <shraddha.basantwani@ittiam.com> Thu Oct 12 10:50:26 2023 +0000
committer Shraddha Basantwani <shraddha.basantwani@ittiam.com> Fri Oct 20 05:47:27 2023 +0000
tree a4f2d564847723c64c16a724a3c7feadd198926c
parent b1fd6953612af6e5a749894f2c915ce39bd1b411

AudioPolicy: Replace ALOG with nullptr check before adding values to vector

Bug: 277299684
Test: ./audiopolicy_fuzzer clusterfuzz-testcase-minimized-audiopolicy_fuzzer-4740706102804480
Test: ./audiopolicy_fuzzer clusterfuzz-testcase-minimized-audiopolicy_fuzzer-4913502336647168
Change-Id: Ie76f32d2f67beb22f3a92d14ebb31a49c1e574d6

services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp

diff --git a/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
index 62e5bd4..514601c 100644
--- a/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp
@@ -225,8 +225,7 @@
 {
     bool added = false;
     for (const auto& device : devices) {
-        ALOG_ASSERT(device != nullptr, "Null pointer found when adding DeviceVector");
-        if (indexOf(device) < 0 && SortedVector::add(device) >= 0) {
+        if (device && indexOf(device) < 0 && SortedVector::add(device) >= 0) {
             added = true;
         }
     }
@@ -238,7 +237,10 @@
 
 ssize_t DeviceVector::add(const sp<DeviceDescriptor>& item)
 {
-    ALOG_ASSERT(item != nullptr, "Adding null pointer to DeviceVector");
+    if (!item) {
+        ALOGW("DeviceVector::%s() null device", __func__);
+        return -1;
+    }
     ssize_t ret = indexOf(item);
 
     if (ret < 0) {