tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 00:34:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2012/12/05 15:42:52

Browse Source 
[ssh-add.c]
     prevent double-free of comment; ok djm@
This commit is contained in:
Darren Tucker 2012-12-07 13:07:02 +11:00
parent f9333d5246
commit 8a96522482
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,9 @@
- jmc@cvs.openbsd.org 2012/12/03 08:33:03 - jmc@cvs.openbsd.org 2012/12/03 08:33:03
[ssh-add.1 sshd_config.5] [ssh-add.1 sshd_config.5]
tweak previous; tweak previous;
- markus@cvs.openbsd.org 2012/12/05 15:42:52
[ssh-add.c]
prevent double-free of comment; ok djm@
20121205 20121205
- (tim) [defines.h] Some platforms are missing ULLONG_MAX. Feedback djm@. - (tim) [defines.h] Some platforms are missing ULLONG_MAX. Feedback djm@.

3
ssh-add.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-add.c,v 1.104 2012/12/02 20:42:15 djm Exp $ */ /* $OpenBSD: ssh-add.c,v 1.105 2012/12/05 15:42:52 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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)
/* Now try to delete the corresponding certificate too */ /* Now try to delete the corresponding certificate too */
free(comment); free(comment);
comment = NULL;
xasprintf(&certpath, "%s-cert.pub", filename); xasprintf(&certpath, "%s-cert.pub", filename);
if ((cert = key_load_public(certpath, &comment)) == NULL) if ((cert = key_load_public(certpath, &comment)) == NULL)
goto out; goto out;