Fix memory leak

sustrik · Mar 25, 2017 · e926d64 · e926d64
1 parent f6a52c5
commit e926d64
Showing 1 changed file with 35 additions and 9 deletions.
diff --git a/ipaddr.c b/ipaddr.c
@@ -296,33 +296,55 @@ int ipaddr_remote(struct ipaddr *addr, const char *name, int port, int mode,
             int err = errno;
             fdclean(fd);
             errno = err;
-            if(dill_slow(rc < 0)) return -1;
+            if(dill_slow(rc < 0)) {
+                dns_ai_close(ai);
+                return -1;
+            }
             continue;
         }
         if(rc == ENOENT || (rc >= DNS_EBASE && rc <= DNS_ELAST))
             break;
-        if(!ipv4 && it && it->ai_family == AF_INET)
+        if(!ipv4 && it && it->ai_family == AF_INET) {
             ipv4 = it;
-        if(!ipv6 && it && it->ai_family == AF_INET6)
+            it = NULL;
+        }
+        if(!ipv6 && it && it->ai_family == AF_INET6) {
             ipv6 = it;
+            it = NULL;
+        }
+        if(it) freeaddrinfo(it); /* Ended up useless */
         if(ipv4 && ipv6)
             break;
     }
     switch(mode) {
     case IPADDR_IPV4:
-        ipv6 = NULL;
+        if(ipv6) {
+            freeaddrinfo(ipv6);
+            ipv6 = NULL;
+        }
         break;
     case IPADDR_IPV6:
-        ipv4 = NULL;
+        if(ipv4) {
+            freeaddrinfo(ipv4);
+            ipv4 = NULL;
+        }
         break;
     case 0:
     case IPADDR_PREF_IPV4:
-        if(ipv4)
-           ipv6 = NULL;
+        if(ipv4) {
+            if(ipv6) {
+                freeaddrinfo(ipv6);
+                ipv6 = NULL;
+            }
+        }
         break;
     case IPADDR_PREF_IPV6:
-        if(ipv6)
-           ipv4 = NULL;
+        if(ipv6) {
+            if(ipv4) {
+                freeaddrinfo(ipv4);
+                ipv4 = NULL;
+            }
+        }
         break;
     default:
         dill_assert(0);
@@ -331,13 +353,17 @@ int ipaddr_remote(struct ipaddr *addr, const char *name, int port, int mode,
         struct sockaddr_in *inaddr = (struct sockaddr_in*)addr;
         memcpy(inaddr, ipv4->ai_addr, sizeof (struct sockaddr_in));
         inaddr->sin_port = htons(port);
+        if(ipv4) freeaddrinfo(ipv4);
+        if(ipv6) freeaddrinfo(ipv6);
         dns_ai_close(ai);
         return 0;
     }
     if(ipv6) {
         struct sockaddr_in6 *inaddr = (struct sockaddr_in6*)addr;
         memcpy(inaddr, ipv6->ai_addr, sizeof (struct sockaddr_in6));
         inaddr->sin6_port = htons(port);
+        if(ipv4) freeaddrinfo(ipv4);
+        if(ipv6) freeaddrinfo(ipv6);
         dns_ai_close(ai);
         return 0;
     }