- markus@cvs.openbsd.org 2004/12/23 17:38:07

     [ssh-keygen.c]
     leak; from mpech

diff --git a/ChangeLog b/ChangeLog
index a17c47872a36140d78c157854dec961ff329c77b..962a544c5888d8601b5500a4f068ac0408c30e47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - markus@cvs.openbsd.org 2004/12/23 17:35:48
      [session.c]
      check for NULL; from mpech
+   - markus@cvs.openbsd.org 2004/12/23 17:38:07
+     [ssh-keygen.c]
+     leak; from mpech
 
 20050118
  - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement

diff --git a/ssh-keygen.c b/ssh-keygen.c
index d39e7d8811e9ccc393269eb229d6fcd773b08cc8..7ed62a30c5d81aea2f6910d3d73ffc8d81edf2c4 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.117 2004/07/11 17:48:47 deraadt Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.118 2004/12/23 17:38:07 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -239,6 +239,7 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
        } else if (strstr(type, "rsa")) {
                ktype = KEY_RSA;
        } else {
+               buffer_free(&b);
                xfree(type);
                return NULL;
        }