summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-06-07 00:16:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-07 00:16:32 +0000
commitf3af14e6df266f466e0bf7868d002cfe8104c128 (patch)
tree30c66489e1e6d190a77cec60a4dc57d1b4958e28 /adb
parentf6d8dedd87eb8bbccbbdeb17a6d226f089449d92 (diff)
parentef47eb1948ba394866f53c41c459561fc372a3b5 (diff)
downloadsystem_core-f3af14e6df266f466e0bf7868d002cfe8104c128.zip
system_core-f3af14e6df266f466e0bf7868d002cfe8104c128.tar.gz
system_core-f3af14e6df266f466e0bf7868d002cfe8104c128.tar.bz2
am ef47eb19: am 30136150: Merge "adb: avoid leaking file descriptors"
* commit 'ef47eb1948ba394866f53c41c459561fc372a3b5': adb: avoid leaking file descriptors
Diffstat (limited to 'adb')
-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;