X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/ae0500e538e2fb821ef1ad8529aed7999acf7a19..77603464f5b4231df69eb20ca278062bd7aae9fb:/sshrsa.c

diff --git a/sshrsa.c b/sshrsa.c
index f684c2af..4f95fb38 100644
--- a/sshrsa.c
+++ b/sshrsa.c
@@ -54,7 +54,7 @@ int makekey(unsigned char *data, int len, struct RSAKey *result,
     }
 
     n = ssh1_read_bignum(p, len, result ? &result->modulus : NULL);
-    if (n < 0 || bignum_bitcount(result->modulus) == 0) return -1;
+    if (n < 0 || (result && bignum_bitcount(result->modulus) == 0)) return -1;
     if (result)
 	result->bytes = n - 2;
     if (keystr)
@@ -802,6 +802,7 @@ static unsigned char *rsa2_sign(void *key, char *data, int datalen,
     SHA_Simple(data, datalen, hash);
 
     nbytes = (bignum_bitcount(rsa->modulus) - 1) / 8;
+    assert(1 <= nbytes - 20 - ASN1_LEN);
     bytes = snewn(nbytes, unsigned char);
 
     bytes[0] = 1;