=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshconnect2.c,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- src/usr.bin/ssh/sshconnect2.c 2013/05/17 00:13:14 1.197 +++ src/usr.bin/ssh/sshconnect2.c 2013/06/05 12:52:38 1.198 @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.197 2013/05/17 00:13:14 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.198 2013/06/05 12:52:38 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1316,8 +1316,11 @@ return NULL; } private = key_load_private_type(KEY_UNSPEC, filename, "", NULL, &perm_ok); - if (!perm_ok) + if (!perm_ok) { + if (private != NULL) + key_free(private); return NULL; + } if (private == NULL) { if (options.batch_mode) return NULL; @@ -1909,6 +1912,7 @@ free(name); return current; } + free(name); } }