diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-04-30 17:48:31 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-04-30 17:48:31 -0400 |
| commit | 68dc682499ea3fe27d909c946d7abd39062d6efd (patch) | |
| tree | 3478a6fb3699bdfa08d5871848696882ee1c24db /apps/rsa.c | |
| parent | 222561fe8ef510f336417a666f69f81ddc9b8fe4 (diff) | |
In apps, malloc or die
No point in proceeding if you're out of memory. So change
*all* OPENSSL_malloc calls in apps to use the new routine which
prints a message and exits.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/rsa.c')
| -rw-r--r-- | apps/rsa.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/apps/rsa.c b/apps/rsa.c index c8b05e60ce..0a8e198d8e 100644 --- a/apps/rsa.c +++ b/apps/rsa.c @@ -344,19 +344,14 @@ int rsa_main(int argc, char **argv) } # ifndef OPENSSL_NO_RC4 else if (outformat == FORMAT_NETSCAPE) { - unsigned char *p, *pp; - int size; + unsigned char *p, *save; + int size = i2d_RSA_NET(rsa, NULL, NULL, 0); - i = 1; - size = i2d_RSA_NET(rsa, NULL, NULL, 0); - if ((p = OPENSSL_malloc(size)) == NULL) { - BIO_printf(bio_err, "Memory allocation failure\n"); - goto end; - } - pp = p; + save = p = app_malloc(size, "RSA i2d buffer"); i2d_RSA_NET(rsa, &p, NULL, 0); - BIO_write(out, (char *)pp, size); - OPENSSL_free(pp); + BIO_write(out, (char *)save, size); + OPENSSL_free(save); + i = 1; } # endif else if (outformat == FORMAT_PEM) { |