commit 5a3a0907ef22ee76737dff9e35adab4ac6991fdc
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 28 06:19:02 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 28 06:19:02 2023 +0000
tree 3acaebefab4deeee275487f82d6d041341dd29db
parent c244d3b27adf8d8f49f37489976ce3dc94cdd119
parent 5e311b67f4bb1480141d03c011fbadf1e68dd275

Merge "Audio : Fix ASAN crash in VTS test cases" am: 5e311b67f4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2508735

Change-Id: I0a55499f1019bc42f92098465cdef1ec3075717a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

audio/aidl/vts/EffectHelper.h

diff --git a/audio/aidl/vts/EffectHelper.h b/audio/aidl/vts/EffectHelper.h
index f6683cc..831977b 100644
--- a/audio/aidl/vts/EffectHelper.h
+++ b/audio/aidl/vts/EffectHelper.h
@@ -228,10 +228,10 @@
      */
     template <typename S, typename = std::enable_if_t<std::is_arithmetic_v<S>>>
     static std::set<S> expandTestValueBasic(std::set<S>& s) {
-        const auto min = *s.begin(), max = *s.rbegin();
         const auto minLimit = std::numeric_limits<S>::min(),
                    maxLimit = std::numeric_limits<S>::max();
         if (s.size()) {
+            const auto min = *s.begin(), max = *s.rbegin();
             s.insert(min + (max - min) / 2);
             if (min != minLimit) {
                 s.insert(min - 1);