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

[openssh.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index 0c950745bdecb38e2a3b0928741a37c10a9e0f44..f34be679cfb430ec0ccc8be0da75349d891e804f 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -687,7 +687,7 @@ main(int ac, char **av)
        if (options.rhosts_rsa_authentication ||
            options.hostbased_authentication) {
                sensitive_data.nkeys = 3;
-               sensitive_data.keys = xmalloc(sensitive_data.nkeys *
+               sensitive_data.keys = xcalloc(sensitive_data.nkeys, 
                    sizeof(Key));
 
                PRIV_START;
@@ -1250,7 +1250,8 @@ env_permitted(char *env)
        int i;
        char name[1024], *cp;
 
-       strlcpy(name, env, sizeof(name));
+       if (strlcpy(name, env, sizeof(name)) >= sizeof(name))
+               fatal("env_permitted: name too long");
        if ((cp = strchr(name, '=')) == NULL)
                return (0);