From d4963650de01d908eea5792e2a8dd0f72ea9d582 Mon Sep 17 00:00:00 2001 From: jacob Date: Sun, 30 Oct 2005 16:28:45 +0000 Subject: [PATCH] Fixes to make r6434 actually useful. git-svn-id: svn://svn.tartarus.org/sgt/putty@6435 cda61777-01e9-0310-a592-d414129be87e --- sshpubk.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sshpubk.c b/sshpubk.c index fddc6e56..812a8e9a 100644 --- a/sshpubk.c +++ b/sshpubk.c @@ -71,11 +71,6 @@ static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only, if (i < 0) goto end; /* overran */ - if (pub_only) { - ret = 1; - goto end; - } - /* Next, the comment field. */ j = GET_32BIT(buf + i); i += 4; @@ -88,9 +83,17 @@ static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only, } i += j; if (commentptr) - *commentptr = comment; + *commentptr = dupstr(comment); if (key) key->comment = comment; + else + sfree(comment); + + if (pub_only) { + ret = 1; + goto end; + } + if (!key) { ret = ciphertype != 0; *error = NULL; -- 2.11.0