commit ff3e6f401eb371bd51eaed91bfec1728ec22f3d1
author Eric Laurent <elaurent@google.com> Wed Oct 12 10:38:12 2016 -0700
committer Eric Laurent <elaurent@google.com> Wed Oct 12 18:25:12 2016 +0000
tree 4893f6efc0e44030f18e7770d0c71c3226479902
parent bfab6fae721d04225581aaa26d8b37a19d549943

audio_route: add check on enum values

Bug: 31906753
Bug: 32064030
Change-Id: Id57ad136b2c314040e6cbf62a3319ecef2c2114b

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;
 }