From 8b8a5315a9321c5385d9d5b441f1e5af9eed37fe Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 22 Jan 2014 07:53:35 -0800 Subject: tools: Close file descriptors in the calling function --- tools/btproxy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/btproxy.c') diff --git a/tools/btproxy.c b/tools/btproxy.c index 9f409c3e4..be81bae66 100644 --- a/tools/btproxy.c +++ b/tools/btproxy.c @@ -330,11 +330,8 @@ static bool setup_proxy(int host_fd, bool host_shutdown, 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 @@ static void server_callback(int fd, uint32_t events, void *user_data) 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; } -- cgit v1.2.1