X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=import.c;h=bc35a4ab7d08b5aebb64332e7d0b84dad2f50bb2;hb=1472aa2a265dfbfe7225729862ea21b5fb2da22f;hp=f6dc2809a28c6aed884a293e67f66ac38cf685bb;hpb=01ead8590b5459393e6a87b5f591bce6fb8de8d3;p=PuTTY.git

diff --git a/import.c b/import.c
index f6dc2809..bc35a4ab 100644
--- a/import.c
+++ b/import.c
@@ -1247,11 +1247,15 @@ int sshcom_encrypted(const Filename *filename, char **comment)
         answer = 1;
 
     done:
-    *comment = dupstr(key ? key->comment : "");
-    smemclr(key->keyblob, key->keyblob_size);
-    sfree(key->keyblob);
-    smemclr(key, sizeof(*key));
-    sfree(key);
+    if (key) {
+        *comment = dupstr(key->comment);
+        smemclr(key->keyblob, key->keyblob_size);
+        sfree(key->keyblob);
+        smemclr(key, sizeof(*key));
+        sfree(key);
+    } else {
+        *comment = dupstr("");
+    }
     return answer;
 }