commit e12085b0c596a85192fb124a0d5f8c652b55a3ef
author Eric Laurent <elaurent@google.com> Thu Oct 13 00:19:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 00:19:40 2016 +0000
tree 4893f6efc0e44030f18e7770d0c71c3226479902
parent 4eb2a5da1db1481f099d79f1cbb0dd37d90e3bc6
parent ff3e6f401eb371bd51eaed91bfec1728ec22f3d1

audio_route: add check on enum values
am: ff3e6f401e

Change-Id: I4a9cfe96aac7472dde381cbb8756353d3cd128f2

audio_route/audio_route.c

diff --git a/audio_route/audio_route.c b/audio_route/audio_route.c
index 90b114d..bd5c112 100644
--- a/audio_route/audio_route.c
+++ b/audio_route/audio_route.c
@@ -420,13 +420,24 @@
 static int mixer_enum_string_to_value(struct mixer_ctl *ctl, const char *string)
 {
     unsigned int i;
+    unsigned int num_values = mixer_ctl_get_num_enums(ctl);
+
+    if (string == NULL) {
+        ALOGE("NULL enum value string passed to mixer_enum_string_to_value() for ctl %s",
+              mixer_ctl_get_name(ctl));
+        return 0;
+    }
 
     /* Search the enum strings for a particular one */
-    for (i = 0; i < mixer_ctl_get_num_enums(ctl); i++) {
+    for (i = 0; i < num_values; i++) {
         if (strcmp(mixer_ctl_get_enum_string(ctl, i), string) == 0)
             break;
     }
-
+    if (i == num_values) {
+        ALOGE("unknown enum value string %s for ctl %s",
+              string, mixer_ctl_get_name(ctl));
+        return 0;
+    }
     return i;
 }