- deraadt@cvs.openbsd.org 2001/04/14 04:31:01

     [ssh-add.c]
     do not double free

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 80140019f..ffa68adf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20010415
+ - OpenBSD CVS Sync
+   - deraadt@cvs.openbsd.org 2001/04/14 04:31:01
+     [ssh-add.c]
+     do not double free
+
 20010414
  - Sync with OpenBSD glob.c, strlcat.c and vis.c changes
  - Cygwin sftp/sftp-server binary mode patch from Corinna Vinschen 
@@ -5063,4 +5069,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1110 2001/04/13 23:28:01 mouring Exp $
+$Id: ChangeLog,v 1.1111 2001/04/14 23:07:16 mouring Exp $
diff --git a/ssh-add.c b/ssh-add.c
index f887455bf..8032cd24f 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.33 2001/04/09 15:12:23 markus Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.34 2001/04/14 04:31:01 deraadt Exp $");
 
 #include <openssl/evp.h>
 
@@ -188,6 +188,7 @@ add_file(AuthenticationConnection *ac, const char *filename)
                         }
                         if (strcmp(pass, "") == 0) {
                                 xfree(pass);
+                                pass = NULL;
                                 xfree(comment);
                                 return;
                         }