commit 6677429bff68bf99e78f5ed9edcdcba4a4a915b7
author Ting-Yuan Huang <laszio@google.com> Wed Aug 16 17:06:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 16 17:06:44 2017 +0000
tree 849b5462594da1469a843ebbbd4478ea6c49957a
parent 4e8bbb968c31a99bc31f2f2ce0d25ced6746befb
parent f583ff660e377e821afc6df300b229971c0679ea

Merge "Fix a potential memory leak"
am: f583ff660e

Change-Id: Ib6c7f4b328d91c59248a20486f49fb1f3d8051a0

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;