upstream commit

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

Upstream-ID: 5e50ded78cadf3841556649a16cc4b1cb6c58667

1 files changed, 3 insertions, 3 deletions

diff --git a/sftp-server.c b/sftp-server.c
index d1831bf8d..eac11d7e6 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.106 2015/04/24 01:36:01 deraadt Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.107 2015/08/20 22:32:42 deraadt Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -1632,8 +1632,8 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw)
                 fatal("%s: sshbuf_new failed", __func__);
 
         set_size = howmany(max + 1, NFDBITS) * sizeof(fd_mask);
-        rset = (fd_set *)xmalloc(set_size);
-        wset = (fd_set *)xmalloc(set_size);
+        rset = xmalloc(set_size);
+        wset = xmalloc(set_size);
 
         if (homedir != NULL) {
                 if (chdir(homedir) != 0) {