X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/23159902a3ae593f9022578201125600a8da8de1..6e3c47cb9cf52992ff76e7e9795ea37fe6a884db:/cmdgen.c

diff --git a/cmdgen.c b/cmdgen.c
index 254ae6a7..33662c3b 100644
--- a/cmdgen.c
+++ b/cmdgen.c
@@ -779,11 +779,13 @@ int main(int argc, char **argv)
 	    if (!load_encrypted) {
 		ssh2blob = ssh2_userkey_loadpub(infilename, &ssh2alg,
 						&ssh2bloblen, NULL, &error);
-		ssh2algf = find_pubkey_alg(ssh2alg);
-		if (ssh2algf)
-		    bits = ssh2algf->pubkey_bits(ssh2blob, ssh2bloblen);
-		else
-		    bits = -1;
+                if (ssh2blob) {
+                    ssh2algf = find_pubkey_alg(ssh2alg);
+                    if (ssh2algf)
+                        bits = ssh2algf->pubkey_bits(ssh2blob, ssh2bloblen);
+                    else
+                        bits = -1;
+                }
 	    } else {
 		ssh2key = ssh2_load_userkey(infilename, passphrase, &error);
 	    }