Commit: f6d51cd8143a3e7f64321b8df6120498057e58b7 - system-coremmmm (git)

system/corennnnn

Commit MetaInfo

• Revisión: f6d51cd8143a3e7f64321b8df6120498057e58b7 (tree)
• Tiempo: 2016-09-04 08:47:15
• Autor: Josh Gao <jmgao@goog...>
• Commiter: Steve Kondik

Log Message

adb: fix fd leak when shell fails to create a thread.

Bug: http://b/29565233
Change-Id: Ia59c6dbe5ac033425c11739579e85cbcad1170d1

Cambiar Resumen

• modified: adb/shell_service.cpp

Diferencia incremental

--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -778,13 +778,14 @@ int StartSubprocess(const char* name, const char* terminal_type,
         return ReportError(protocol, error);
     }
 
-    int local_socket = subprocess->ReleaseLocalSocket();
-    D("subprocess creation successful: local_socket_fd=%d, pid=%d", local_socket, subprocess->pid());
+    unique_fd local_socket(subprocess->ReleaseLocalSocket());
+    D("subprocess creation successful: local_socket_fd=%d, pid=%d", local_socket.get(),
+      subprocess->pid());
 
     if (!Subprocess::StartThread(std::move(subprocess), &error)) {
         LOG(ERROR) << "failed to start subprocess management thread: " << error;
         return ReportError(protocol, error);
     }
 
-    return local_socket;
+    return local_socket.release();
 }