commit 31c90df4f05a26ebdd1442f6b4542193fbf422f3
author Ravi Kumar Alamanda <ralama@codeaurora.org> Fri Oct 16 10:06:59 2015 -0700
committer Ravi Kumar Alamanda <ralama@codeaurora.org> Fri Oct 16 10:06:59 2015 -0700
tree 6c4ef6f7cf968af6999dc14f0d8daa1c41e6cd4c
parent aa7e6f67b2583da9bbcfe7b77dbd99bdcb06a64f

hal: Add NULL check before freeing snd_card_name

Ensure the pointer is valid before freeing to avoid
crash when a valid sound card is not found.

Change-Id: I2a2681935797e059b925c9f70f352aa603a41d9c
CRs-Fixed: 924286

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 723bf5b..0a18c55 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1267,7 +1267,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;
@@ -1379,7 +1379,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;
     }