From e4c98bb91e35dba56a077e8e5b9c70556fdd4e24 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 19 Mar 2013 10:58:21 +0100 Subject: curvetun: Only close() file descriptor if open Only attempt to close the file descriptor in error cases where it is actually open. This was discovered by the coverity scanner. Signed-off-by: Tobias Klauser --- curvetun.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/curvetun.c b/curvetun.c index 3e7bdb4..0baa9e4 100644 --- a/curvetun.c +++ b/curvetun.c @@ -280,7 +280,7 @@ static void create_keypair(char *home) if (fd < 0) { err = EIO; errstr = "Cannot open pubkey file!\n"; - goto out; + goto out_noclose; } ret = write(fd, publickey, sizeof(publickey)); @@ -301,7 +301,7 @@ static void create_keypair(char *home) if (fd < 0) { err = EIO; errstr = "Cannot open privkey file!\n"; - goto out; + goto out_noclose; } ret = write(fd, secretkey, sizeof(secretkey)); @@ -312,7 +312,7 @@ static void create_keypair(char *home) } out: close(fd); - +out_noclose: xmemset(publickey, 0, sizeof(publickey)); xmemset(secretkey, 0, sizeof(secretkey)); -- cgit v1.2.3-54-g00ecf