commit 42e1fea5866b6ea4d320938cba325b8a8e61a517
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jul 30 00:44:31 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 30 00:44:31 2024 +0000
tree c2507ee88790a5a0d1cd32aab6a53032c76892b0
parent d54f50920dfd793741379497050e4cf1e7575fea
parent 24289ea9b3c1cfd06587b817f6f543f860b36aef

Merge "Close the socket fd in case of an exception during setupSocket method to avoid socket leak." into main am: 24289ea9b3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3154919

Change-Id: I032326f675bce5ba028a2ce4424cbc2be3c654f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

service/src/com/android/server/connectivity/NetworkDiagnostics.java

diff --git a/service/src/com/android/server/connectivity/NetworkDiagnostics.java b/service/src/com/android/server/connectivity/NetworkDiagnostics.java
index 3db37e5..8a2e72c 100644
--- a/service/src/com/android/server/connectivity/NetworkDiagnostics.java
+++ b/service/src/com/android/server/connectivity/NetworkDiagnostics.java
@@ -567,7 +567,9 @@
 
         @Override
         public void close() {
-            IoUtils.closeQuietly(mFileDescriptor);
+            if (mFileDescriptor != null) {
+                IoUtils.closeQuietly(mFileDescriptor);
+            }
         }
     }
 
@@ -611,6 +613,7 @@
                 setupSocket(SOCK_DGRAM, mProtocol, TIMEOUT_SEND, TIMEOUT_RECV, 0);
             } catch (ErrnoException | IOException e) {
                 mMeasurement.recordFailure(e.toString());
+                close();
                 return;
             }
             mMeasurement.description += " src{" + socketAddressToString(mSocketAddress) + "}";
@@ -695,6 +698,7 @@
                         NetworkConstants.DNS_SERVER_PORT);
             } catch (ErrnoException | IOException e) {
                 mMeasurement.recordFailure(e.toString());
+                close();
                 return;
             }