summaryrefslogtreecommitdiff
path: root/ssh-pkcs11-helper.c
diff options
context:
space:
mode:
authorderaadt@openbsd.org <deraadt@openbsd.org>2015-08-20 22:32:42 +0000
committerDamien Miller <djm@mindrot.org>2015-08-21 13:43:25 +1000
commitce445b0ed927e45bd5bdce8f836eb353998dd65c (patch)
tree34170a772ddf573879b8ae244bafd6871be0fd11 /ssh-pkcs11-helper.c
parent05291e5288704d1a98bacda269eb5a0153599146 (diff)
upstream commit
Do not cast result of malloc/calloc/realloc* if stdlib.h is in scope ok krw millert Upstream-ID: 5e50ded78cadf3841556649a16cc4b1cb6c58667
Diffstat (limited to 'ssh-pkcs11-helper.c')
-rw-r--r--ssh-pkcs11-helper.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c
index ceabc8ba7..f2d586395 100644
--- a/ssh-pkcs11-helper.c
+++ b/ssh-pkcs11-helper.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-pkcs11-helper.c,v 1.10 2015/01/20 23:14:00 deraadt Exp $ */ 1/* $OpenBSD: ssh-pkcs11-helper.c,v 1.11 2015/08/20 22:32:42 deraadt Exp $ */
2/* 2/*
3 * Copyright (c) 2010 Markus Friedl. All rights reserved. 3 * Copyright (c) 2010 Markus Friedl. All rights reserved.
4 * 4 *
@@ -301,8 +301,8 @@ main(int argc, char **argv)
301 buffer_init(&oqueue); 301 buffer_init(&oqueue);
302 302
303 set_size = howmany(max + 1, NFDBITS) * sizeof(fd_mask); 303 set_size = howmany(max + 1, NFDBITS) * sizeof(fd_mask);
304 rset = (fd_set *)xmalloc(set_size); 304 rset = xmalloc(set_size);
305 wset = (fd_set *)xmalloc(set_size); 305 wset = xmalloc(set_size);
306 306
307 for (;;) { 307 for (;;) {
308 memset(rset, 0, set_size); 308 memset(rset, 0, set_size);