summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshconnect2.c
diff options
context:
space:
mode:
authormmcc <mmcc@openbsd.org>2015-12-10 17:08:40 +0000
committermmcc <mmcc@openbsd.org>2015-12-10 17:08:40 +0000
commit1b895242ce0e7b0bb67e09a5f50eb9e279005ed7 (patch)
tree671497ed555e2ccf32a2feb5783adf0518e53434 /usr.bin/ssh/sshconnect2.c
parentMap SOCKS error codes to error strings. With input from deraadt@ (diff)
downloadwireguard-openbsd-1b895242ce0e7b0bb67e09a5f50eb9e279005ed7.tar.xz
wireguard-openbsd-1b895242ce0e7b0bb67e09a5f50eb9e279005ed7.zip
Remove NULL-checks before free().
ok dtucker@
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
-rw-r--r--usr.bin/ssh/sshconnect2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index d5bf301947b..8639426dfca 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.231 2015/12/04 16:41:28 markus Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.232 2015/12/10 17:08:40 mmcc Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -1249,8 +1249,7 @@ load_identity_file(Identity *id)
explicit_bzero(passphrase, strlen(passphrase));
free(passphrase);
}
- if (comment)
- free(comment);
+ free(comment);
if (private != NULL || quit)
break;
}