| commit | be172eab0a5593be9077e9afdeb582769e932b5a | [log] [tgz] |
|---|---|---|
| author | Shaju Mathew <shaju@google.com> | Tue Jan 02 19:09:50 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 02 19:09:50 2024 +0000 |
| tree | 50f768bc6f1b7684c5a2476f486d2eff2b121c64 | |
| parent | 085087f8eed58603f90674703cb8b64dbb61330e [diff] | |
| parent | 15afa33f8ef88bf5527e70d83bfbdf5119c70509 [diff] |
Merge "Fix a mdns coverity issue to avoid RESOURCE_LEAK" into main am: 15afa33f8e Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2834190 Change-Id: Id7f710d5e436419a43d9964e9c6f75d7e2df8bc9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/mDNSShared/PlatformCommon.c b/mDNSShared/PlatformCommon.c index 2fb530e..607a7e7 100644 --- a/mDNSShared/PlatformCommon.c +++ b/mDNSShared/PlatformCommon.c
@@ -66,7 +66,12 @@ addr.a6.sin6_addr = *(struct in6_addr*)&dst->ip.v6; addr.a6.sin6_scope_id = 0; } - else return; + else + { + // __ANDROID__ : Fix fd leak + goto exit; + } + if ((connect(sock, &addr.s, inner_len)) < 0) { LogMsg("mDNSPlatformSourceAddrForDest: connect %#a failed errno %d (%s)", dst, errno, strerror(errno)); goto exit; }