LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix socket leaks in various android.net.Network methods." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-30 09:47:51 +00:00
committed by Android (Google) Code Review
parent dd8a3c78c5 55eaa09f96
commit f26c5341a5
1 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/java/android/net/Network.java
View File

@@ -26,6 +26,8 @@ import android.util.proto.ProtoOutputStream;
import com.android.okhttp.internalandroidapi.Dns; import com.android.okhttp.internalandroidapi.Dns;
import com.android.okhttp.internalandroidapi.HttpURLConnectionFactory; import com.android.okhttp.internalandroidapi.HttpURLConnectionFactory;
import libcore.io.IoUtils;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
import java.net.DatagramSocket; import java.net.DatagramSocket;
@@ -142,9 +144,15 @@ public class Network implements Parcelable {
for (int i = 0; i < hostAddresses.length; i++) { for (int i = 0; i < hostAddresses.length; i++) {
try { try {
Socket socket = createSocket(); Socket socket = createSocket();
if (localAddress != null) socket.bind(localAddress); boolean failed = true;
socket.connect(new InetSocketAddress(hostAddresses[i], port)); try {
return socket; if (localAddress != null) socket.bind(localAddress);
socket.connect(new InetSocketAddress(hostAddresses[i], port));
failed = false;
return socket;
} finally {
if (failed) IoUtils.closeQuietly(socket);
}
} catch (IOException e) { } catch (IOException e) {
if (i == (hostAddresses.length - 1)) throw e; if (i == (hostAddresses.length - 1)) throw e;
} }
@@ -161,15 +169,27 @@ public class Network implements Parcelable {
public Socket createSocket(InetAddress address, int port, InetAddress localAddress, public Socket createSocket(InetAddress address, int port, InetAddress localAddress,
int localPort) throws IOException { int localPort) throws IOException {
Socket socket = createSocket(); Socket socket = createSocket();
socket.bind(new InetSocketAddress(localAddress, localPort)); boolean failed = true;
socket.connect(new InetSocketAddress(address, port)); try {
socket.bind(new InetSocketAddress(localAddress, localPort));
socket.connect(new InetSocketAddress(address, port));
failed = false;
} finally {
if (failed) IoUtils.closeQuietly(socket);
}
return socket; return socket;
} }
@Override @Override
public Socket createSocket(InetAddress host, int port) throws IOException { public Socket createSocket(InetAddress host, int port) throws IOException {
Socket socket = createSocket(); Socket socket = createSocket();
socket.connect(new InetSocketAddress(host, port)); boolean failed = true;
try {
socket.connect(new InetSocketAddress(host, port));
failed = false;
} finally {
if (failed) IoUtils.closeQuietly(socket);
}
return socket; return socket;
} }
@@ -181,7 +201,13 @@ public class Network implements Parcelable {
@Override @Override
public Socket createSocket() throws IOException { public Socket createSocket() throws IOException {
Socket socket = new Socket(); Socket socket = new Socket();
bindSocket(socket); boolean failed = true;
try {
bindSocket(socket);
failed = false;
} finally {
if (failed) IoUtils.closeQuietly(socket);
}
return socket; return socket;
} }
} }