diff options
| author | Shaju Mathew <shaju@google.com> | 2024-01-02 20:08:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-02 20:08:17 +0000 |
| commit | 4d590a2af4635249bc6e4022c7e819ade1fe659b (patch) | |
| tree | 50f768bc6f1b7684c5a2476f486d2eff2b121c64 | |
| parent | c837cd352c2dd06500421c783396d91c329e53db (diff) | |
| parent | 50b2dec70e688c6434e4a2f1338eb2ec0a243c29 (diff) | |
| download | mdnsresponder-4d590a2af4635249bc6e4022c7e819ade1fe659b.tar.gz | |
Merge "Fix a mdns coverity issue to avoid RESOURCE_LEAK" into main am: 15afa33f8e am: be172eab0a am: 50b2dec70e
Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2834190
Change-Id: Ie2276f8b1e960383b657d5c4d74eb9359f74810c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | mDNSShared/PlatformCommon.c | 7 |
1 files changed, 6 insertions, 1 deletions
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; } |