commit a6e2512620ef9244981c7362c487c53583eff898
author qctecmdr <qctecmdr@localhost> Thu May 26 00:46:31 2022 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu May 26 00:46:31 2022 -0700
tree a89d2c88860322887b3e3427d0b480fda8c6e9da
parent 61c20c266df55ddb5fd579a2361378a994d5c395
parent 86fb6260f230503dcc06096a478c889d75e536a4

Merge "primary-hal: Fix double free of fds"

hal/audio_extn/sndmonitor.c

diff --git a/hal/audio_extn/sndmonitor.c b/hal/audio_extn/sndmonitor.c
index e86d6b6..5e39d37 100644
--- a/hal/audio_extn/sndmonitor.c
+++ b/hal/audio_extn/sndmonitor.c
@@ -81,8 +81,6 @@
 #define AUDIO_PARAMETER_KEY_EXT_AUDIO_DEVICE "ext_audio_device"
 #define INIT_MAP_SIZE 5
 
-#define FD_INVALID -1
-
 typedef enum {
     audio_event_on,
     audio_event_off
@@ -247,11 +245,8 @@
         }
 
         ret = add_new_sndcard(atoi(ptr), fd);
-
-        close(fd);
-        fd = FD_INVALID;
-
         if (ret != 0) {
+            close(fd);
             continue;
         }
 
@@ -280,11 +275,8 @@
             continue;
 
         ret = add_new_sndcard(CPE_MAGIC_NUM+num_cpe, fd);
-
-        close(fd);
-        fd = FD_INVALID;
-
         if (ret != 0) {
+            close(fd);
             continue;
         }
 
@@ -312,11 +304,10 @@
         }
         if (fd >= 0) {
             ret = add_new_sndcard(SLPI_MAGIC_NUM, fd);
-            if (ret == 0)
+            if (ret != 0)
+                close(fd);
+            else
                 num_cards++;
-
-            close(fd);
-            fd = FD_INVALID;
         }
     }