Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9891efe1 authored by Shraddha Basantwani's avatar Shraddha Basantwani
Browse files

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
parent b1fd6953

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

+5 −3
Original line number Diff line number Diff line
@@ -225,8 +225,7 @@ void DeviceVector::add(const DeviceVector &devices) 
{

    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 @@ void DeviceVector::add(const DeviceVector &devices) 


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) {