From cc352594310789528ded9afdb0b9e1e6fa319c5c Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Tue, 5 Jun 2012 18:03:51 +0200 Subject: [PATCH] mdnssd: avoid leaking descriptors fixes upstream bug Change-Id: Ic971e5a9566319ec3baea0a381271fd3bd8d49bc Reviewed-by: Nikolai Kosjar --- src/tools/mdnssd/mDNSUNP.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tools/mdnssd/mDNSUNP.c b/src/tools/mdnssd/mDNSUNP.c index 8027676cfe3..40acccbbe39 100755 --- a/src/tools/mdnssd/mDNSUNP.c +++ b/src/tools/mdnssd/mDNSUNP.c @@ -204,9 +204,11 @@ struct ifi_info *get_ifi_info_linuxv6(int family, int doaliases) res0=NULL; } done: - if (sockfd != -1) { - assert(close(sockfd) == 0); - } + if (fp != NULL) + fclose(fp); + if (sockfd != -1 && close(sockfd) != 0) { + assert(1); + } return(ifihead); /* pointer to first structure in linked list */ } #endif // defined(AF_INET6) && HAVE_IPV6 && HAVE_LINUX