summaryrefslogtreecommitdiff
path: root/core/java/android/net/LocalSocketImpl.java
diff options
context:
space:
mode:
authorDave Platt <dplatt@google.com>2013-12-06 14:03:47 -0800
committerNick Kralevich <nnk@google.com>2014-02-28 12:04:51 -0800
commitd75932b521bc23fee304c3bf9e023762cf3fbb82 (patch)
tree5737451b3d41f56ab398505ca445f51e2da95a0e /core/java/android/net/LocalSocketImpl.java
parenteee2c72f96cd4e6228c50c8b461b4dd84a9f4538 (diff)
Fix descriptor leak after accepting connections
After accepting a connection on a listening socket and storing the resulting FileDescriptor into a newly created LocalSocketImpl, the new impl's "descriptor was created locally and should be closed normally" flag should be set. (cherrypicked from 3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d) Bug: 11805817 Change-Id: I0a1a7c62ec3fbcf647a44a22110ddc778d14e5f4
Diffstat (limited to 'core/java/android/net/LocalSocketImpl.java')
-rw-r--r--core/java/android/net/LocalSocketImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/LocalSocketImpl.java b/core/java/android/net/LocalSocketImpl.java
index b2ee50afc608..119e5330f127 100644
--- a/core/java/android/net/LocalSocketImpl.java
+++ b/core/java/android/net/LocalSocketImpl.java
@@ -326,6 +326,7 @@ class LocalSocketImpl
}
s.fd = accept(fd, s);
+ s.mFdCreatedInternally = true;
}
/**
@@ -536,4 +537,3 @@ class LocalSocketImpl
close();
}
}
-