diff options
author | Shaju Mathew <shaju@google.com> | 2024-01-02 19:40:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-02 19:40:18 +0000 |
commit | 50b2dec70e688c6434e4a2f1338eb2ec0a243c29 (patch) | |
tree | 50f768bc6f1b7684c5a2476f486d2eff2b121c64 | |
parent | a37b3bd5b9c77b3a88ed18658237ca7c937da783 (diff) | |
parent | be172eab0a5593be9077e9afdeb582769e932b5a (diff) | |
download | mdnsresponder-50b2dec70e688c6434e4a2f1338eb2ec0a243c29.tar.gz |
Merge "Fix a mdns coverity issue to avoid RESOURCE_LEAK" into main am: 15afa33f8e am: be172eab0a
Original change: https://android-review.googlesource.com/c/platform/external/mdnsresponder/+/2834190
Change-Id: I08e99aa5655105f0fd72e0f09a9a00bd369a33aa
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; } |