commit ce445b0ed927e45bd5bdce8f836eb353998dd65c
author deraadt@openbsd.org <deraadt@openbsd.org> Thu Aug 20 22:32:42 2015 +0000
committer Damien Miller <djm@mindrot.org> Fri Aug 21 13:43:25 2015 +1000
tree 34170a772ddf573879b8ae244bafd6871be0fd11
parent 05291e5288704d1a98bacda269eb5a0153599146

upstream commit

Do not cast result of malloc/calloc/realloc* if stdlib.h
 is in scope ok krw millert

Upstream-ID: 5e50ded78cadf3841556649a16cc4b1cb6c58667

sshd.c

diff --git a/sshd.c b/sshd.c
index c7dd8cb..65ef7e8 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.457 2015/07/30 00:01:34 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.458 2015/08/20 22:32:42 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1253,7 +1253,7 @@
 			sighup_restart();
 		if (fdset != NULL)
 			free(fdset);
-		fdset = (fd_set *)xcalloc(howmany(maxfd + 1, NFDBITS),
+		fdset = xcalloc(howmany(maxfd + 1, NFDBITS),
 		    sizeof(fd_mask));
 
 		for (i = 0; i < num_listen_socks; i++)