projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a couple of code paths on which, if fxp_readdir returned an error,
[u/mdw/putty]
/
sshpubk.c
diff --git
a/sshpubk.c
b/sshpubk.c
index
bd3c5e4
..
4db37c2
100644
(file)
--- a/
sshpubk.c
+++ b/
sshpubk.c
@@
-67,14
+67,15
@@
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 += 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 */
goto end; /* overran */
+ i += j;
/* Next, the comment field. */
j = GET_32BIT(buf + i);
i += 4;
/* Next, the comment field. */
j = GET_32BIT(buf + i);
i += 4;
- if (len - i < j)
+ if (
j < 0 ||
len - i < j)
goto end;
comment = snewn(j + 1, char);
if (comment) {
goto end;
comment = snewn(j + 1, char);
if (comment) {