From: Andre <maan@p133.(none)>
Date: Wed, 12 Jul 2006 15:16:08 +0000 (+0200)
Subject: Fix two fd leaks
X-Git-Tag: v0.2.14~57^2~13
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=fd849823e540103ff0c8ac9c687e03872e84877c

Fix two fd leaks
---

diff --git a/client_common.c b/client_common.c
index c738079b..d1389259 100644
--- a/client_common.c
+++ b/client_common.c
@@ -295,29 +295,32 @@ int client_open(struct private_client_data *pcd)
 	struct hostent *he;
 	struct sockaddr_in their_addr;
 
+	pcd->fd = -1;
 	ret = get_host_info(pcd->conf.hostname_arg, &he);
 	if (ret < 0)
-		goto out;
+		goto err_out;
 	/* get new socket */
 	ret = get_socket();
 	if (ret < 0)
-		goto out;
+		goto err_out;
 	pcd->fd = ret;
 	/* init their_addr */
 	init_sockaddr(&their_addr, pcd->conf.server_port_arg, he);
 	ret = para_connect(pcd->fd, &their_addr);
 	if (ret < 0)
-		goto out;
+		goto err_out;
 	pcd->status = CL_CONNECTED;
 	ret = mark_fd_nonblock(pcd->fd);
 	if (ret < 0)
-		goto out;
+		goto err_out;
 	pcd->task.pre_select = client_pre_select;
 	pcd->task.post_select = client_post_select;
 	pcd->task.private_data = pcd;
 	sprintf(pcd->task.status, "client");
 	register_task(&pcd->task);
-	ret = 1;
-out:
+	return 1;
+err_out:
+	if (pcd->fd >= 0)
+		close(pcd->fd);
 	return ret;
 }
diff --git a/http_recv.c b/http_recv.c
index 386aacbc..c418af12 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -198,8 +198,10 @@ static int http_recv_open(struct receiver_node *rn)
 	PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg,
 		conf->port_arg);
 	ret = para_connect(phd->fd, &their_addr);
-	if (ret < 0)
+	if (ret < 0) {
+		close(phd->fd);
 		goto err_out;
+	}
 	mark_fd_nonblock(phd->fd);
 	phd->status = HTTP_CONNECTED;
 	return 1;