From 029625219bf401345016414883866d4beddfe0b6 Mon Sep 17 00:00:00 2001 From: pdw <> Date: Wed, 1 Jan 2014 12:01:21 +0000 Subject: Fix for memory leak when DNS resolution is turned off. Patch by Olivier Allard-Jacquin Debian bug ID #677141: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677141 --- resolver.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resolver.c b/resolver.c index c09de9d..3ca8835 100644 --- a/resolver.c +++ b/resolver.c @@ -472,15 +472,15 @@ void resolve(int af, void* addr, char* result, int buflen) { int added = 0; struct addr_storage *raddr; - raddr = malloc(sizeof *raddr); - memset(raddr, 0, sizeof *raddr); - raddr->af = af; - raddr->len = (af == AF_INET ? sizeof(struct in_addr) - : sizeof(struct in6_addr)); - memcpy(&raddr->addr, addr, raddr->len); - if(options.dnsresolution == 1) { + raddr = malloc(sizeof *raddr); + memset(raddr, 0, sizeof *raddr); + raddr->af = af; + raddr->len = (af == AF_INET ? sizeof(struct in_addr) + : sizeof(struct in6_addr)); + memcpy(&raddr->addr, addr, raddr->len); + pthread_mutex_lock(&resolver_queue_mutex); if(hash_find(ns_hash, raddr, u_hostname.void_pp) == HASH_STATUS_OK) { -- cgit v1.2.3