- djm@cvs.openbsd.org 2006/03/25 00:05:41

     [auth-bsdauth.c auth-skey.c auth.c auth2-chall.c channels.c]
     [clientloop.c deattack.c gss-genr.c kex.c key.c misc.c moduli.c]
     [monitor.c monitor_wrap.c packet.c scard.c sftp-server.c ssh-agent.c]
     [ssh-keyscan.c ssh.c sshconnect.c sshconnect2.c sshd.c uuencode.c]
     [xmalloc.c xmalloc.h]
     introduce xcalloc() and xasprintf() failure-checked allocations
     functions and use them throughout openssh

     xcalloc is particularly important because malloc(nmemb * size) is a
     dangerous idiom (subject to integer overflow) and it is time for it
     to die

     feedback and ok deraadt@

1 files changed, 1 insertions, 1 deletions

diff --git a/scard.c b/scard.c
index 7cffc2d4e..c0c22aa73 100644
--- a/scard.c
+++ b/scard.c
@@ -382,7 +382,7 @@ sc_get_keys(const char *id, const char *pin)
                 key_free(k);
                 return NULL;
         }
-        keys = xmalloc((nkeys+1) * sizeof(Key *));
+        keys = xcalloc((nkeys+1), sizeof(Key *));
 
         n = key_new(KEY_RSA1);
         BN_copy(n->rsa->n, k->rsa->n);