- dtucker@cvs.openbsd.org 2013/06/05 12:52:38

     [sshconnect2.c]
     Fix memory leaks found by Zhenbo Xu and the Melton tool.  bz#1967, ok djm

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 27f0cfcfa..43a6e7d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,9 @@
      When running sshd -D, close stderr unless we have explicitly requesting
      logging to stderr. From james.hunt at ubuntu.com via bz#1976, djm's patch
      so, err, ok dtucker.
+   - dtucker@cvs.openbsd.org 2013/06/05 12:52:38
+     [sshconnect2.c]
+     Fix memory leaks found by Zhenbo Xu and the Melton tool.  bz#1967, ok djm
 
 20130602
  - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
diff --git a/sshconnect2.c b/sshconnect2.c
index 19ed3459f..70e3cd8c9 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -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.
@@ -1322,8 +1322,11 @@ load_identity_file(char *filename, int userprovided)
                 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;
@@ -1915,6 +1918,7 @@ authmethod_get(char *authlist)
                         free(name);
                         return current;
                 }
+                free(name);
         }
 }