summaryrefslogtreecommitdiffstats
path: root/adb/jdwp_service.c
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2011-02-01 18:57:41 -0800
committerBenoit Goby <benoit@android.com>2011-02-02 14:14:09 -0800
commit95ef82866c7a922bf588027aa38c58a45eb84d9c (patch)
treeaa5438b9396c4a57644d316be73542585f84a59a /adb/jdwp_service.c
parent305b4b0f6069d733d3023a57fdc8a6d9cf7de2a6 (diff)
downloadsystem_core-95ef82866c7a922bf588027aa38c58a45eb84d9c.zip
system_core-95ef82866c7a922bf588027aa38c58a45eb84d9c.tar.gz
system_core-95ef82866c7a922bf588027aa38c58a45eb84d9c.tar.bz2
Fix adb leaking file descriptors to forked processes
accept() creates a new file descriptor that should be closed on exec so that forked processes don't keep a fd opened on the socket. This also fixes b/3297070 where adb hangs after running adb on the target. Change-Id: I8df511289e5549ae49b4824c9dfb71a3bf85eae8
Diffstat (limited to 'adb/jdwp_service.c')
-rw-r--r--adb/jdwp_service.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/adb/jdwp_service.c b/adb/jdwp_service.c
index 296f718..cd62b55 100644
--- a/adb/jdwp_service.c
+++ b/adb/jdwp_service.c
@@ -499,6 +499,7 @@ jdwp_control_init( JdwpControl* control,
/* only wait for incoming connections */
fdevent_add(control->fde, FDE_READ);
+ close_on_exec(s);
D("jdwp control socket started (%d)\n", control->listen_socket);
return 0;