commit 5c70f7e3106bb9457cd5ea2f638cd430ba67eb9c
author Nick Kralevich <nnk@google.com> Sat Jun 07 00:19:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 07 00:19:51 2014 +0000
tree fa182859d6b4f34630f807b48682a325e49b3984
parent 45e2756409bee6b766fd965bd945f9d42789fb33
parent f3af14e6df266f466e0bf7868d002cfe8104c128

am f3af14e6: am ef47eb19: am 30136150: Merge "adb: avoid leaking file descriptors"

* commit 'f3af14e6df266f466e0bf7868d002cfe8104c128':
  adb: avoid leaking file descriptors

adb/framebuffer_service.c

diff --git a/adb/framebuffer_service.c b/adb/framebuffer_service.c
index fa7fd98..8cbe840 100644
--- a/adb/framebuffer_service.c
+++ b/adb/framebuffer_service.c
@@ -61,7 +61,7 @@
     int w, h, f;
     int fds[2];
 
-    if (pipe(fds) < 0) goto pipefail;
+    if (pipe2(fds, O_CLOEXEC) < 0) goto pipefail;
 
     pid_t pid = fork();
     if (pid < 0) goto done;