aboutsummaryrefslogtreecommitdiffstats
path: root/apps/x509.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2015-04-30 17:48:31 -0400
committerRich Salz <rsalz@openssl.org>2015-04-30 17:48:31 -0400
commit68dc682499ea3fe27d909c946d7abd39062d6efd (patch)
tree3478a6fb3699bdfa08d5871848696882ee1c24db /apps/x509.c
parent222561fe8ef510f336417a666f69f81ddc9b8fe4 (diff)
downloadopenssl-68dc682499ea3fe27d909c946d7abd39062d6efd.tar.gz
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/x509.c')
-rw-r--r--apps/x509.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/apps/x509.c b/apps/x509.c
index e1cc3cde1f..5418cce8cf 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -783,12 +783,7 @@ int x509_main(int argc, char **argv)
" */\n", buf);
len = i2d_X509(x, NULL);
- m = OPENSSL_malloc(len);
- if (!m) {
- BIO_printf(bio_err, "Out of memory\n");
- goto end;
- }
-
+ m = app_malloc(len, "x509 name buffer");
d = (unsigned char *)m;
len = i2d_X509_NAME(X509_get_subject_name(x), &d);
print_array(out, "the_subject_name", len, (unsigned char *)m);
@@ -976,11 +971,7 @@ static ASN1_INTEGER *x509_load_serial(char *CAfile, char *serialfile,
len = ((serialfile == NULL)
? (strlen(CAfile) + strlen(POSTFIX) + 1)
: (strlen(serialfile))) + 1;
- buf = OPENSSL_malloc(len);
- if (buf == NULL) {
- BIO_printf(bio_err, "out of mem\n");
- goto end;
- }
+ buf = app_malloc(len, "serial# buffer");
if (serialfile == NULL) {
BUF_strlcpy(buf, CAfile, len);
for (p = buf; *p; p++)