From: Jason Parker Date: Tue, 10 Jul 2007 18:37:23 +0000 (+0000) Subject: Use res_ndestroy on systems that have it. Otherwise, use res_nclose. X-Git-Tag: 1.2.22~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71fa9ce0c4e5b9d984b1598c2d2bf57f0c6604dc;p=thirdparty%2Fasterisk.git Use res_ndestroy on systems that have it. Otherwise, use res_nclose. This prevents a memleak on NetBSD - and possibly others. Issue 10133, patch by me, reported and tested by scw git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@74373 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/dns.c b/dns.c index 8b26ff3779..d71c76ad7c 100644 --- a/dns.c +++ b/dns.c @@ -175,6 +175,9 @@ static int dns_parse_answer(void *context, #if defined(res_ninit) #define HAS_RES_NINIT +#if defined(res_ndestroy) +#define HAS_RES_NDESTROY +#endif #else AST_MUTEX_DEFINE_STATIC(res_lock); #if 0 @@ -217,7 +220,11 @@ int ast_search_dns(void *context, ret = 1; } #ifdef HAS_RES_NINIT +#ifdef HAS_RES_NDESTROY + res_ndestroy(&dnsstate); +#else res_nclose(&dnsstate); +#endif #else #ifndef __APPLE__ res_close();