- (dtucker) [auth-pam.c groupaccess.c monitor.c monitor_wrap.c scard-opensc.c

   session.c ssh-rand-helper.c sshd.c openbsd-compat/bsd-cygwin_util.c
   openbsd-compat/setproctitle.c] Convert malloc(foo*bar) -> calloc(foo,bar)
   in Portable-only code; since calloc zeros, remove now-redundant memsets.
   Also add a couple of sanity checks.  With & ok djm@

1 files changed, 3 insertions, 1 deletions

diff --git a/scard-opensc.c b/scard-opensc.c
index dd2c28df2..7a496dff8 100644
--- a/scard-opensc.c
+++ b/scard-opensc.c
@@ -455,7 +455,9 @@ sc_get_keys(const char *id, const char *pin)
                 }
                 key_count = r;
         }
-        keys = xmalloc(sizeof(Key *) * (key_count*2+1));
+        if (key_count > 1024)
+                fatal("Too many keys (%u), expected <= 1024", key_count);
+        keys = xcalloc(key_count * 2 + 1, sizeof(Key *));
         for (i = 0; i < key_count; i++) {
                 sc_pkcs15_object_t *tmp_obj = NULL;
                 cert_id = ((sc_pkcs15_cert_info_t *)(certs[i]->data))->id;