From: Michael Poole <mdpoole@troilus.org>
Date: Sat, 7 Oct 2006 00:03:52 +0000 (+0000)
Subject: Fix a (tiny) memory leak in mod-sockcheck.c.
X-Git-Tag: v1.4.0-rc1~98
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=eaba5fa5fffc9341581a08c2ae7bfa3fe094720c

Fix a (tiny) memory leak in mod-sockcheck.c.

src/mod-sockcheck.c (sockcheck_begin_test): Make io_fd assignment
    clearer.
  (sockcheck_read_conf): Free the addrinfo we get.
git-archimport-id: srvx@srvx.net--2006/srvx--devo--1.3--patch-58
---

diff --git a/ChangeLog b/ChangeLog
index 8131210..8f8191b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,21 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2006/srvx--devo--1.3
 #
 
+2006-10-07 00:03:52 GMT	Michael Poole <mdpoole@troilus.org>	patch-58
+
+    Summary:
+      Fix a (tiny) memory leak in mod-sockcheck.c.
+    Revision:
+      srvx--devo--1.3--patch-58
+
+    src/mod-sockcheck.c (sockcheck_begin_test): Make io_fd assignment
+        clearer.
+      (sockcheck_read_conf): Free the addrinfo we get.
+
+    modified files:
+     ChangeLog src/mod-sockcheck.c
+
+
 2006-10-06 23:18:58 GMT	Michael Poole <mdpoole@troilus.org>	patch-57
 
     Summary:
diff --git a/src/mod-sockcheck.c b/src/mod-sockcheck.c
index a21aad9..8413e90 100644
--- a/src/mod-sockcheck.c
+++ b/src/mod-sockcheck.c
@@ -662,7 +662,8 @@ sockcheck_begin_test(struct sockcheck_client *client)
         client->state = client->tests->list[client->test_index];
         client->read_pos = 0;
         client->read_used = 0;
-        client->fd = io_fd = ioset_connect(sockcheck_conf.local_addr, sockcheck_conf.local_addr_len, client->addr->hostname, client->state->port, 0, client, sockcheck_connected);
+        io_fd = ioset_connect(sockcheck_conf.local_addr, sockcheck_conf.local_addr_len, client->addr->hostname, client->state->port, 0, client, sockcheck_connected);
+        client->fd = io_fd;
         if (!io_fd) {
             client->test_index++;
             continue;
@@ -1151,6 +1152,7 @@ sockcheck_read_conf(void)
 	    sockcheck_conf.local_addr_len = ai->ai_addrlen;
             sockcheck_conf.local_addr = calloc(1, ai->ai_addrlen);
             memcpy(sockcheck_conf.local_addr, ai->ai_addr, ai->ai_addrlen);
+            freeaddrinfo(ai);
         } else {
             sockcheck_conf.local_addr_len = 0;
             sockcheck_conf.local_addr = NULL;