~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
One more defensive assert, just to be sure.
[sgt/putty]
/
cmdgen.c
diff --git
a/cmdgen.c
b/cmdgen.c
index
254ae6a
..
69c0177
100644
(file)
--- a/
cmdgen.c
+++ b/
cmdgen.c
@@
-102,6
+102,16
@@
void modalfatalbox(char *p, ...)
cleanup_exit(1);
}
cleanup_exit(1);
}
+void nonfatal(char *p, ...)
+{
+ va_list ap;
+ fprintf(stderr, "ERROR: ");
+ va_start(ap, p);
+ vfprintf(stderr, p, ap);
+ va_end(ap);
+ fputc('\n', stderr);
+}
+
/*
* Stubs to let everything else link sensibly.
*/
/*
* Stubs to let everything else link sensibly.
*/
@@
-779,11
+789,13
@@
int main(int argc, char **argv)
if (!load_encrypted) {
ssh2blob = ssh2_userkey_loadpub(infilename, &ssh2alg,
&ssh2bloblen, NULL, &error);
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);
}
} else {
ssh2key = ssh2_load_userkey(infilename, passphrase, &error);
}