commit 81a41f1fc928b01cdcf709666c7c53da25fa8702
author Linux Build Service Account <lnxbuild@localhost> Fri Oct 23 19:12:47 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Oct 23 19:12:47 2015 -0700
tree 77c376a5108daabb7521d8b7f86d2e2d3568d31e
parent 78f1670a89dd12640552024571069671fb026728
parent 31c90df4f05a26ebdd1442f6b4542193fbf422f3

Merge "hal: Add NULL check before freeing snd_card_name"

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 9015a5f..e9a2418 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1265,7 +1265,7 @@
     char value[PROPERTY_VALUE_MAX];
     struct platform_data *my_data = NULL;
     int retry_num = 0, snd_card_num = 0, key = 0;
-    const char *snd_card_name;
+    const char *snd_card_name = NULL;
     char *cvd_version = NULL;
     char *snd_internal_name = NULL;
     char *tmp = NULL;
@@ -1377,7 +1377,8 @@
     if (snd_card_num >= MAX_SND_CARD) {
         ALOGE("%s: Unable to find correct sound card, aborting.", __func__);
         free(my_data);
-        free(snd_card_name);
+        if (snd_card_name)
+            free(snd_card_name);
         return NULL;
     }