summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-06-07 00:19:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-07 00:19:51 +0000
commit5c70f7e3106bb9457cd5ea2f638cd430ba67eb9c (patch)
treefa182859d6b4f34630f807b48682a325e49b3984
parent45e2756409bee6b766fd965bd945f9d42789fb33 (diff)
parentf3af14e6df266f466e0bf7868d002cfe8104c128 (diff)
downloadsystem_core-5c70f7e3106bb9457cd5ea2f638cd430ba67eb9c.zip
system_core-5c70f7e3106bb9457cd5ea2f638cd430ba67eb9c.tar.gz
system_core-5c70f7e3106bb9457cd5ea2f638cd430ba67eb9c.tar.bz2
am f3af14e6: am ef47eb19: am 30136150: Merge "adb: avoid leaking file descriptors"
* commit 'f3af14e6df266f466e0bf7868d002cfe8104c128': adb: avoid leaking file descriptors
-rw-r--r--adb/framebuffer_service.c2
1 files changed, 1 insertions, 1 deletions
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 @@ void framebuffer_service(int fd, void *cookie)
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;