- dtucker@cvs.openbsd.org 2007/11/03 02:00:32

     [ssh.c]
     Use xstrdup/xfree when saving pwname and pwdir; ok deraadt@

diff --git a/ChangeLog b/ChangeLog
index 2e27344b74fa13b3dd1c7038f84dc459d5a3c153..7dacad9a706e07005e54f3a7798aa28f81f5aaec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@
      bz #1377: getpwuid results were being clobbered by another getpw* call
      inside tilde_expand_filename(); save the data we need carefully
      ok djm
+   - dtucker@cvs.openbsd.org 2007/11/03 02:00:32
+     [ssh.c]
+     Use xstrdup/xfree when saving pwname and pwdir; ok deraadt@
 
 20071030
  - (djm) OpenBSD CVS Sync

diff --git a/ssh.c b/ssh.c
index f9c6252d39f8e29e93cd2ea6c7b250cff141e410..7e23acff6a9bcbc01f7890dd8322d67e51c72b97 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.306 2007/11/03 01:24:06 deraadt Exp $ */
+/* $OpenBSD: ssh.c,v 1.307 2007/11/03 02:00:32 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1260,8 +1260,8 @@ load_public_identity_files(void)
 #endif /* SMARTCARD */
        if ((pw = getpwuid(original_real_uid)) == NULL)
                fatal("load_public_identity_files: getpwuid failed");
-       pwname = strdup(pw->pw_name);
-       pwdir = strdup(pw->pw_dir);
+       pwname = xstrdup(pw->pw_name);
+       pwdir = xstrdup(pw->pw_dir);
        if (gethostname(thishost, sizeof(thishost)) == -1)
                fatal("load_public_identity_files: gethostname: %s",
                    strerror(errno));
@@ -1280,9 +1280,9 @@ load_public_identity_files(void)
                options.identity_keys[i] = public;
        }
        bzero(pwname, strlen(pwname));
-       free(pwname);
+       xfree(pwname);
        bzero(pwdir, strlen(pwdir));
-       free(pwdir);
+       xfree(pwdir);
 }
 
 static void