commit a7feec551ef390d8f4652ad684e90fdaefde9738
author Linux Build Service Account <lnxbuild@localhost> Wed Oct 31 05:59:30 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Oct 31 05:59:29 2018 -0700
tree 5e636d6335d49dbe0f2b9fdc35e2746b5defd76a
parent 17c1ecdfdb8668891be316eb0f37a47b9837f36f
parent 170875c7d4fa482a08acf811919eec7c1a8cc76c

Merge "hal: Add support to enable fluence in sdxpoorwills"

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 498701c..19327d6 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -5092,7 +5092,15 @@
             platform->spkr_ch_map->num_ch = num_ch;
             for (i = 0; i < num_ch; i++) {
                 opts = strtok_r(NULL, ", ", &test_r);
-                platform->spkr_ch_map->chmap[i] = strtoul(opts, NULL, 16);
+                if (opts == NULL) {
+                    ALOGE("%s: incorrect ch_map\n", __func__);
+                    free(platform->spkr_ch_map);
+                    platform->spkr_ch_map = NULL;
+                    str_parms_del(parms, AUDIO_PARAMETER_KEY_SPKR_DEVICE_CHMAP);
+                    return;
+                } else {
+                    platform->spkr_ch_map->chmap[i] = strtoul(opts, NULL, 16);
+                }
             }
         }
         str_parms_del(parms, AUDIO_PARAMETER_KEY_SPKR_DEVICE_CHMAP);