X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Femail.c;h=0b140bfed55a0560aeb6e4f06f42ec39987c190e;hb=70ea9457f76d6cd953f2cbd64eeda0ff265f47db;hp=1bf9addaea09631f005ec96af2e97c9fdd602a56;hpb=40aabf444e124f40603021821e98bcc40c4aaa0e;p=collectd.git

diff --git a/src/email.c b/src/email.c
index 1bf9adda..0b140bfe 100644
--- a/src/email.c
+++ b/src/email.c
@@ -509,28 +509,42 @@ static void *open_connection (void __attribute__((unused)) *arg)
 
 		pthread_mutex_unlock (&available_mutex);
 
-		do {
+		while (42) {
 			errno = 0;
-			if (-1 == (remote = accept (connector_socket, NULL, NULL))) {
-				if (EINTR != errno) {
-					char errbuf[1024];
-					disabled = 1;
-					close (connector_socket);
-					connector_socket = -1;
-					log_err ("accept() failed: %s",
-							sstrerror (errno, errbuf, sizeof (errbuf)));
-					pthread_exit ((void *)1);
-				}
+
+			remote = accept (connector_socket, NULL, NULL);
+			if (remote == -1) {
+				char errbuf[1024];
+
+				if (errno == EINTR)
+					continue;
+
+				disabled = 1;
+				close (connector_socket);
+				connector_socket = -1;
+				log_err ("accept() failed: %s",
+						 sstrerror (errno, errbuf, sizeof (errbuf)));
+				pthread_exit ((void *)1);
 			}
-		} while (EINTR == errno);
 
-		connection = (conn_t *)smalloc (sizeof (conn_t));
+			/* access() succeeded. */
+			break;
+		}
+
+		connection = malloc (sizeof (*connection));
+		if (connection != NULL)
+		{
+			close (remote);
+			continue;
+		}
+		memset (connection, 0, sizeof (*connection));
 
 		connection->socket = fdopen (remote, "r");
 		connection->next   = NULL;
 
 		if (NULL == connection->socket) {
 			close (remote);
+			sfree (connection);
 			continue;
 		}