~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another two mis-fixes from r9919: when we sfree(line) on exit from the
[sgt/putty]
/
import.c
diff --git
a/import.c
b/import.c
index
32a1ac5
..
f6dc280
100644
(file)
--- a/
import.c
+++ b/
import.c
@@
-372,6
+372,7
@@
static struct openssh_key *load_openssh_key(const Filename *filename,
if (0 == strncmp(line, "-----END ", 9) &&
0 == strcmp(line+strlen(line)-16, "PRIVATE KEY-----")) {
sfree(line);
if (0 == strncmp(line, "-----END ", 9) &&
0 == strcmp(line+strlen(line)-16, "PRIVATE KEY-----")) {
sfree(line);
+ line = NULL;
break; /* done */
}
if ((p = strchr(line, ':')) != NULL) {
break; /* done */
}
if ((p = strchr(line, ':')) != NULL) {
@@
-1095,6
+1096,7
@@
static struct sshcom_key *load_sshcom_key(const Filename *filename,
strip_crlf(line);
if (!strcmp(line, "---- END SSH2 ENCRYPTED PRIVATE KEY ----")) {
sfree(line);
strip_crlf(line);
if (!strcmp(line, "---- END SSH2 ENCRYPTED PRIVATE KEY ----")) {
sfree(line);
+ line = NULL;
break; /* done */
}
if ((p = strchr(line, ':')) != NULL) {
break; /* done */
}
if ((p = strchr(line, ':')) != NULL) {