commit 902fc41b69a399f8c1289add6a98e767ea2595b3
author Jhansi Konathala <cjkonat@codeaurora.org> Wed Sep 05 13:21:44 2018 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 27 00:46:37 2018 -0700
tree 9698e97dc38cfe17e6c7e392e363ead5672c57a2
parent a505f5f6173d65abd5d0f2676c49e17ea484c5c9

hal: fix null pointer references and data initialization errors

 - add null pointer check and initialize uninitialized variables

CRs-Fixed: 2312146
Change-Id: I5f260b327492e1373ed143dd8dcf243154fd7818

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index d05c5ed..82fafc7 100755
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -5113,7 +5113,8 @@
             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)
+                    platform->spkr_ch_map->chmap[i] = strtoul(opts, NULL, 16);
             }
         }
         str_parms_del(parms, AUDIO_PARAMETER_KEY_SPKR_DEVICE_CHMAP);