Another two mis-fixes from r9919: when we sfree(line) on exit from the

ssh.com and OpenSSH key import loops, we should also null it out so
that the cleanup path doesn't try to re-free the same pointer.

[originally from svn r9944]
[r9919 == ea301bdd9b892a5e70692f82f5c0b98bd585e775]

diff --git a/import.c b/import.c
index 32a1ac5d1a7a5d580bec04a32c36127add56e224..f6dc2809a28c6aed884a293e67f66ac38cf685bb 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);
+            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);
+            line = NULL;
             break;                     /* done */
         }
        if ((p = strchr(line, ':')) != NULL) {