- Merged more OpenBSD changes:

[openssh.git] / tildexpand.c

diff --git a/tildexpand.c b/tildexpand.c
index 06f397c1a7a41d393bbfd5e3280c09b2784ae80c..9fd430bd40b93bfb5a7ad0ea5a5cd5eab3562940 100644 (file)
--- a/tildexpand.c
+++ b/tildexpand.c
@@ -23,6 +23,7 @@ tilde_expand_filename(const char *filename, uid_t my_uid)
        char *expanded;
        struct passwd *pw;
        char user[100];
+       int len;
 
        /* Return immediately if no tilde. */
        if (filename[0] != '~')
@@ -56,7 +57,10 @@ tilde_expand_filename(const char *filename, uid_t my_uid)
                return xstrdup(pw->pw_dir);
        }
        /* Build a path combining the specified directory and path. */
-       expanded = xmalloc(strlen(pw->pw_dir) + strlen(cp + 1) + 2);
-       sprintf(expanded, "%s/%s", pw->pw_dir, cp + 1);
+       len = strlen(pw->pw_dir) + strlen(cp + 1) + 2;
+       if (len > MAXPATHLEN)
+               fatal("Home directory too long (%d > %d", len-1, MAXPATHLEN-1);
+       expanded = xmalloc(len);
+       snprintf(expanded, len, "%s/%s", pw->pw_dir, cp + 1);
        return expanded;
 }