commit b7769975ddfe37e97f76b2208a4e40d8a10f689a
author Ting-Yuan Huang <laszio@google.com> Wed Aug 16 17:34:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 16 17:34:11 2017 +0000
tree e9855b0753a74d10fc7f1e68d7e87a27569adf70
parent f5ccedea9a16519b5671502ec62ab90aaa3cf883
parent 10b26aa90024f7c68825666d542a47d6e16cde1e

Merge "Fix a potential memory leak" am: f583ff660e am: 6677429bff
am: 6deffe3c3b

Change-Id: Ifcd960527a5da12e136ba96062460208368aafea

adb/services.cpp

diff --git a/adb/services.cpp b/adb/services.cpp
index 9605e6e..55cb6a1 100644
--- a/adb/services.cpp
+++ b/adb/services.cpp
@@ -478,11 +478,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;