summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh.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/ssh.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/ssh.c')
-rw-r--r--usr.bin/ssh/ssh.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index ce7222a696b..eceb325b468 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.430 2015/11/19 08:23:27 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.431 2015/12/10 17:08:40 mmcc Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -881,8 +881,7 @@ main(int ac, char **av)
subsystem_flag = 1;
break;
case 'S':
- if (options.control_path != NULL)
- free(options.control_path);
+ free(options.control_path);
options.control_path = xstrdup(optarg);
break;
case 'b':