commit 301dac68f097fd0245968faab279a5bc73142680
author Weiyin Jiang <wjiang@codeaurora.org> Wed May 08 13:58:00 2019 +0800
committer Weiyin Jiang <wjiang@codeaurora.org> Wed May 08 15:10:56 2019 +0800
tree 7c8bd26b1236082f17762700f8d2b8426b190780
parent 8e69c4adeb546f641b182f39b94a8fd7f1d091a1

audio: fix null pointer dereferenced issue

Fix null pointer dereferenced issue.

Change-Id: I4b7deb66192d836b9b444b13b9a5ed080272f2a7
CRs-Fixed: 2448899

hal/acdb.c

diff --git a/hal/acdb.c b/hal/acdb.c
index 7394906..1775ec0 100644
--- a/hal/acdb.c
+++ b/hal/acdb.c
@@ -164,13 +164,13 @@
 
     /* Get Sound card name */
     snd_card_name = mixer_get_name(mixer);
+    snd_card_name = platform_get_snd_card_name_for_acdb_loader(snd_card_name);
     if (!snd_card_name) {
-        ALOGE("failed to allocate memory for snd_card_name");
+        ALOGE("failed to get snd_card_name");
         result = -1;
         goto cleanup;
     }
 
-    snd_card_name = platform_get_snd_card_name_for_acdb_loader(snd_card_name);
     int key = 0;
     struct listnode *node = NULL;
     struct meta_key_list *key_info = NULL;

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 67845de..3269e0d 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -4123,7 +4123,7 @@
         goto done;
     }
 
-    if(effect_config == NULL) {
+    if (effect_config == NULL) {
         ALOGE("%s: Invalid effect_config", __func__);
         ret = -EINVAL;
         goto done;
@@ -4151,6 +4151,10 @@
     }
 
     device = (struct external_specific_device *)calloc(1, sizeof(struct external_specific_device));
+    if (device == NULL) {
+        ALOGE("%s: memory allocation failed", __func__);
+        return;
+    }
 
     device->usbid = strdup(usbid);
     device->acdb_id = acdb_id;