drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 02f042dd: Fix socket descriptor leak from Zygote to child app

Browse Source 
* commit '02f042ddd9ddf47ef88c4f174eb19a9bee296a45':
  Fix socket descriptor leak from Zygote to child app
This commit is contained in:
Dave Platt
2014-01-07 11:49:49 -08:00
committed by Android Git Automerger
parent 0d4068ad1c 02f042ddd9
commit e966e5774a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/os/ZygoteInit.java
View File

@ -192,10 +192,16 @@ public class ZygoteInit {
static void closeServerSocket() { static void closeServerSocket() {
try { try {
if (sServerSocket != null) { if (sServerSocket != null) {
FileDescriptor fd = sServerSocket.getFileDescriptor();
sServerSocket.close(); sServerSocket.close();
if (fd != null) {
Libcore.os.close(fd);
}
} }
} catch (IOException ex) { } catch (IOException ex) {
Log.e(TAG, "Zygote: error closing sockets", ex); Log.e(TAG, "Zygote: error closing sockets", ex);
} catch (libcore.io.ErrnoException ex) {
Log.e(TAG, "Zygote: error closing descriptor", ex);
} }
sServerSocket = null; sServerSocket = null;