commit 4d22d3e8959aa3837fc1d74c047713c83482cc88
author Bubble Fang <bubblefang@google.com> Fri May 11 08:44:17 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 11 08:44:17 2018 +0000
tree 7cd31cbd35c5ae7baeb53de0b5fd296c62f7b1d8
parent debab2be23dd7236306ea4d3eb2441938f0965d6
parent d9e9f33b897a70209257404e14c7ac1be8d3c181

Merge "ma_listener: correct bounds of array" into pi-dev

post_proc/ma_listener.c

diff --git a/post_proc/ma_listener.c b/post_proc/ma_listener.c
index 8e57db1..02d45d3 100644
--- a/post_proc/ma_listener.c
+++ b/post_proc/ma_listener.c
@@ -61,7 +61,7 @@
 
 static const audio_stream_type_t MIN_STREAM_TYPES = AUDIO_STREAM_VOICE_CALL;
 static const audio_stream_type_t MAX_STREAM_TYPES = AUDIO_STREAM_NOTIFICATION;
-static struct ma_state g_cur_state[MAX_STREAM_TYPES];
+static struct ma_state g_cur_state[MAX_STREAM_TYPES + 1];
 
 struct ma_listener_context_s {
     const struct effect_interface_s *itfe;
@@ -211,6 +211,8 @@
     else if (max_vol > 1.0) max_vol = 1.0;
 
     if (send_ma_parameter != NULL &&
+        stream_type >= MIN_STREAM_TYPES &&
+        stream_type <= MAX_STREAM_TYPES &&
         (g_cur_state[stream_type].vol != max_vol ||
          g_cur_state[stream_type].active != active)) {