commit d72b20e67b43b98cddee9f0667ae571ffd45bc12
author Jhansi Konathala <cjkonat@codeaurora.org> Tue Oct 16 13:35:14 2018 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 23 04:27:49 2018 -0700
tree 53249d1f2fe47408b32da874fc6ee2b5e7d771e7
parent 3dae84519df621f45192f58ae6007350b7cdff87

hal: fix null pointer reference

Add null pointer check to fix null pointer reference

CRs-Fixed: 2334050
Change-Id: Ib2f82eb9730c4a517f247847059b192f199734e4

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 0766311..390a9eb 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -5084,7 +5084,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);