From 85300e0b15d6245f02bfe177289cde1a9babaeb9 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Thu, 11 Jul 2013 17:24:04 +0000
Subject: [PATCH] Fix a mishandling of error returns from makekey() in the
 SSH-1 private key loader.

[originally from svn r9905]
---
 sshpubk.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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);
-- 
2.45.2