commit 88de6e1f51b71a68461d64fbfb79d2372fea253c
author Ting-Yuan Huang <laszio@google.com> Tue Aug 15 15:07:21 2017 -0700
committer Josh Gao <jmgao@google.com> Fri Sep 29 12:43:01 2017 -0700
tree 221803c04894856ad3e5d8c16d78936941b7d46b
parent 4b8529c5ec5745d9fefaf3957874b2924a7e69d0

Fix a potential memory leak

Bug: 65648324
Test: Built without seeing the warnings
Change-Id: I934509c78482af9ef7dc447c807f6450484b4b38
(cherry picked from commit f26cf6d52095a63f822ffc02d3b263543bdec0d9)

adb/services.cpp

diff --git a/adb/services.cpp b/adb/services.cpp
index 3780747..cc840b8 100644
--- a/adb/services.cpp
+++ b/adb/services.cpp
@@ -481,11 +481,17 @@
             return nullptr;
         }
 
-        int fd = create_service_thread(wait_for_state, sinfo.release());
+        int fd = create_service_thread(wait_for_state, sinfo.get());
+        if (fd != -1) {
+            sinfo.release();
+        }
         return create_local_socket(fd);
     } else if (!strncmp(name, "connect:", 8)) {
         char* host = strdup(name + 8);
         int fd = create_service_thread(connect_service, host);
+        if (fd == -1) {
+            free(host);
+        }
         return create_local_socket(fd);
     }
     return NULL;