- (djm) dirname(3) may modify its argument on glibc and other systems.

   Patch from markus@, spotted by Tom Holroyd <tomh@po.crl.go.jp>

1 files changed, 5 insertions, 1 deletions

diff --git a/auth.c b/auth.c
index 84e0be761..436802342 100644
--- a/auth.c
+++ b/auth.c
@@ -368,7 +368,11 @@ secure_filename(FILE *f, const char *file, struct passwd *pw,
         char *cp;
         struct stat st;
 
-        strlcpy(homedir, dirname(pw->pw_dir), sizeof(homedir));
+        strlcpy(homedir, pw->pw_dir, sizeof(homedir));
+        if ((cp = dirname(homedir)) == NULL)
+                strlcpy(homedir, "/", sizeof(homedir));
+        else
+                memmove(homedir, cp, strlen(cp));
 
         if (realpath(file, buf) == NULL) {
                 snprintf(err, errlen, "realpath %s failed: %s", file,