`dwalin' spotted a NULL dereference in the new makekey() error

handling. Oops.

[originally from svn r4541]

diff --git a/sshrsa.c b/sshrsa.c
index f684c2afd109dafd47a1fef702d45513bf1b0a18..baec83e02d517e046557895d8c7623d76df6ce08 100644 (file)
--- 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)