summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshd.c
diff options
context:
space:
mode:
authormmcc <mmcc@cvs.openbsd.org>2015-12-10 17:08:41 +0000
committermmcc <mmcc@cvs.openbsd.org>2015-12-10 17:08:41 +0000
commit3c08fdfac640be5d0cf1ab7cd3cdcc80fb1fb219 (patch)
treeccf4d2f745a868258b702abef3b4971740766edb /usr.bin/ssh/sshd.c
parentbefdcdf0b9b3dd6f91be8c8b79338e73de57c152 (diff)
Remove NULL-checks before free().
ok dtucker@
Diffstat (limited to 'usr.bin/ssh/sshd.c')
-rw-r--r--usr.bin/ssh/sshd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 44fc90ce698..599ee39ef2f 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.461 2015/12/04 16:41:28 markus Exp $ */
+/* $OpenBSD: sshd.c,v 1.462 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
@@ -1204,8 +1204,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
for (;;) {
if (received_sighup)
sighup_restart();
- if (fdset != NULL)
- free(fdset);
+ free(fdset);
fdset = xcalloc(howmany(maxfd + 1, NFDBITS),
sizeof(fd_mask));