commit 6f52ff9eb1596fd6fb183fe4b7a277b15e28a7fc
author Francois Gaffie <francois.gaffie@renault.com> Tue Aug 25 08:53:53 2020 +0200
committer Eric Laurent <elaurent@google.com> Tue Dec 14 15:02:09 2021 +0000
tree 3708a1c13d4433740e1c7170125207745908843e
parent 9c9bafffe8645be71721f7b3b91a388cf7d2a539

[BUG] audiopolicy: engineconfigurable: prevent illegal map access

If any request to get OutputDevice for a given attributes is performed
before the cache has been initalized, an illegal access to the vector
happens.
This CL fixes by returning empty device vector when cache is empty.

Test: build & boot configurable engine target & basic audio

Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: I1371765401441732319be56a9cae6fbf3c5cc2bf

services/audiopolicy/engineconfigurable/src/Engine.cpp

diff --git a/services/audiopolicy/engineconfigurable/src/Engine.cpp b/services/audiopolicy/engineconfigurable/src/Engine.cpp
index b0c376a..9a61a05 100644
--- a/services/audiopolicy/engineconfigurable/src/Engine.cpp
+++ b/services/audiopolicy/engineconfigurable/src/Engine.cpp
@@ -299,8 +299,13 @@
     if (device != nullptr) {
         return DeviceVector(device);
     }
+    return fromCache? getCachedDevices(strategy) : getDevicesForProductStrategy(strategy);
+}
 
-    return fromCache? mDevicesForStrategies.at(strategy) : getDevicesForProductStrategy(strategy);
+DeviceVector Engine::getCachedDevices(product_strategy_t ps) const
+{
+    return mDevicesForStrategies.find(ps) != mDevicesForStrategies.end() ?
+                mDevicesForStrategies.at(ps) : DeviceVector{};
 }
 
 DeviceVector Engine::getOutputDevicesForStream(audio_stream_type_t stream, bool fromCache) const

services/audiopolicy/engineconfigurable/src/Engine.h

diff --git a/services/audiopolicy/engineconfigurable/src/Engine.h b/services/audiopolicy/engineconfigurable/src/Engine.h
index d8e2742..f665da5 100644
--- a/services/audiopolicy/engineconfigurable/src/Engine.h
+++ b/services/audiopolicy/engineconfigurable/src/Engine.h
@@ -126,6 +126,7 @@
     status_t loadAudioPolicyEngineConfig();
 
     DeviceVector getDevicesForProductStrategy(product_strategy_t strategy) const;
+    DeviceVector getCachedDevices(product_strategy_t ps) const;
 
     /**
      * Policy Parameter Manager hidden through a wrapper.