From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Thu, 11 Jul 2013 17:24:04 +0000 (+0000)
Subject: Fix a mishandling of error returns from makekey() in the SSH-1 private
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/e7ca473e61abe08456d2cfc7eed9e118c950e884

Fix a mishandling of error returns from makekey() in the SSH-1 private
key loader.


git-svn-id: svn://svn.tartarus.org/sgt/putty@9905 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/sshpubk.c b/sshpubk.c
index b860040d..4db37c2b 100644
--- a/sshpubk.c
+++ b/sshpubk.c
@@ -67,9 +67,10 @@ static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
     i += 4;
 
     /* Now the serious stuff. An ordinary SSH-1 public key. */
-    i += makekey(buf + i, len, key, NULL, 1);
-    if (i < 0)
+    j = makekey(buf + i, len, key, NULL, 1);
+    if (j < 0)
 	goto end;		       /* overran */
+    i += j;
 
     /* Next, the comment field. */
     j = GET_32BIT(buf + i);