commit d59ce08811bf94111c2f442184cf7d1257ffae24
author mmcc@openbsd.org <mmcc@openbsd.org> Thu Dec 10 17:08:40 2015 +0000
committer Damien Miller <djm@mindrot.org> Fri Dec 11 13:23:14 2015 +1100
tree 5885ad687f762834250c9c3f5b53b3f1b750c9f1
parent 8e56dd46cb37879c73bce2d6032cf5e7f82d5a71

upstream commit

Remove NULL-checks before free().

ok dtucker@

Upstream-ID: e3d3cb1ce900179906af36517b5eea0fb15e6ef8

sshd.c

diff --git a/sshd.c b/sshd.c
index 2f3f5b5..5d2e0a0 100644
--- a/sshd.c
+++ b/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
@@ -1257,8 +1257,7 @@
 	for (;;) {
 		if (received_sighup)
 			sighup_restart();
-		if (fdset != NULL)
-			free(fdset);
+		free(fdset);
 		fdset = xcalloc(howmany(maxfd + 1, NFDBITS),
 		    sizeof(fd_mask));