diff options
| author | jkim <jkim@FreeBSD.org> | 2014-08-07 21:04:42 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-08-07 21:04:42 +0000 |
| commit | 2bfd7007417a2cd7c442bf1162e609303f217744 (patch) | |
| tree | 2ead8295addf0f92cbe4bf28f39105c909a6702f /crypto/openssl/apps/apps.c | |
| parent | 95576e5070819ac5bc80e16b237dc5a0061ed9a4 (diff) | |
| download | FreeBSD-src-2bfd7007417a2cd7c442bf1162e609303f217744.zip FreeBSD-src-2bfd7007417a2cd7c442bf1162e609303f217744.tar.gz | |
MFC: r269682
Merge OpenSSL 1.0.1i.
Diffstat (limited to 'crypto/openssl/apps/apps.c')
| -rw-r--r-- | crypto/openssl/apps/apps.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/openssl/apps/apps.c b/crypto/openssl/apps/apps.c index b76db10..3e18289 100644 --- a/crypto/openssl/apps/apps.c +++ b/crypto/openssl/apps/apps.c @@ -390,6 +390,8 @@ int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[]) { arg->count=20; arg->data=(char **)OPENSSL_malloc(sizeof(char *)*arg->count); + if (arg->data == NULL) + return 0; } for (i=0; i<arg->count; i++) arg->data[i]=NULL; @@ -1542,6 +1544,8 @@ char *make_config_name() len=strlen(t)+strlen(OPENSSL_CONF)+2; p=OPENSSL_malloc(len); + if (p == NULL) + return NULL; BUF_strlcpy(p,t,len); #ifndef OPENSSL_SYS_VMS BUF_strlcat(p,"/",len); |
