commit 8b8a5315a9321c5385d9d5b441f1e5af9eed37fe
author Marcel Holtmann <marcel@holtmann.org> Wed Jan 22 07:53:35 2014 -0800
committer Marcel Holtmann <marcel@holtmann.org> Wed Jan 22 07:53:35 2014 -0800
tree 2da6e459e61a6bded4f4794454fc91f8c1221cfd
parent 6fe5d7f420a70e4a4b24f5ecb8b861d7b4768674

tools: Close file descriptors in the calling function

tools/btproxy.c

diff --git a/tools/btproxy.c b/tools/btproxy.c
index 9f409c3..be81bae 100644
--- a/tools/btproxy.c
+++ b/tools/btproxy.c
@@ -330,11 +330,8 @@
 	struct proxy *proxy;
 
 	proxy = new0(struct proxy, 1);
-	if (!proxy) {
-		close(host_fd);
-		close(dev_fd);
+	if (!proxy)
 		return NULL;
-	}
 
 	proxy->host_fd = host_fd;
 	proxy->host_shutdown = host_shutdown;
@@ -421,8 +418,11 @@
 
 	printf("New client connected\n");
 
-	if (!setup_proxy(host_fd, true, dev_fd, false))
+	if (!setup_proxy(host_fd, true, dev_fd, false)) {
+		close(dev_fd);
+		close(host_fd);
 		return;
+	}
 
 	client_active = true;
 }