diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-03 00:40:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-03 00:40:53 +0000 |
| commit | facd9d15c3be7b5b6093d84395c2e9801ce49ae9 (patch) | |
| tree | 50f768bc6f1b7684c5a2476f486d2eff2b121c64 | |
| parent | 209a1f7e06a0ae7b01187474ba0159a6a16d72e5 (diff) | |
| parent | 99ea2a84db9f081182959e2dc787bd47bd694c81 (diff) | |
| download | mdnsresponder-simpleperf-release.tar.gz | |
Merge "Snap for 11400057 from 15afa33f8ef88bf5527e70d83bfbdf5119c70509 to simpleperf-release" into simpleperf-releasesimpleperf-release
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | OWNERS | 2 | ||||
| -rw-r--r-- | mDNSShared/PlatformCommon.c | 7 |
3 files changed, 11 insertions, 2 deletions
@@ -180,6 +180,10 @@ cc_library { "//apex_available:platform", "com.android.adbd", ], + visibility: [ + "//bootable/recovery/minadbd:__subpackages__", + "//packages/modules/adb:__subpackages__", + ], } //########################### @@ -1,4 +1,4 @@ set noparent -file:platform/packages/modules/Connectivity:main:/OWNERS_core_networking +sanglardf@google.com include platform/packages/modules/adb:/OWNERS 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 @@ mDNSexport void mDNSPlatformSourceAddrForDest(mDNSAddr *const src, const mDNSAdd 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; } |