summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-add.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 19dc33403..7a3f272e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - jmc@cvs.openbsd.org 2012/12/03 08:33:03 12 - jmc@cvs.openbsd.org 2012/12/03 08:33:03
13 [ssh-add.1 sshd_config.5] 13 [ssh-add.1 sshd_config.5]
14 tweak previous; 14 tweak previous;
15 - markus@cvs.openbsd.org 2012/12/05 15:42:52
16 [ssh-add.c]
17 prevent double-free of comment; ok djm@
15 18
1620121205 1920121205
17 - (tim) [defines.h] Some platforms are missing ULLONG_MAX. Feedback djm@. 20 - (tim) [defines.h] Some platforms are missing ULLONG_MAX. Feedback djm@.
diff --git a/ssh-add.c b/ssh-add.c
index c8936e5ae..008084704 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.104 2012/12/02 20:42:15 djm Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.105 2012/12/05 15:42:52 markus Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -118,6 +118,7 @@ delete_file(AuthenticationConnection *ac, const char *filename, int key_only)
118 118
119 /* Now try to delete the corresponding certificate too */ 119 /* Now try to delete the corresponding certificate too */
120 free(comment); 120 free(comment);
121 comment = NULL;
121 xasprintf(&certpath, "%s-cert.pub", filename); 122 xasprintf(&certpath, "%s-cert.pub", filename);
122 if ((cert = key_load_public(certpath, &comment)) == NULL) 123 if ((cert = key_load_public(certpath, &comment)) == NULL)
123 goto out; 124 goto out;