diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-06-27 03:21:10 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-06-27 14:35:07 +0100 |
| commit | d2aea038297e0c64ca66e6844cbb37377365885e (patch) | |
| tree | 13e11f5b4a91e0dc5316bb7c6fb7203c313be84b /apps/apps.c | |
| parent | 3b3b69ab25fbaba80a843dedec5ae9733fefca43 (diff) | |
Memory leak and NULL dereference fixes.
PR#3403
Diffstat (limited to 'apps/apps.c')
| -rw-r--r-- | apps/apps.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/apps.c b/apps/apps.c index 946884860f..7e1cf9cba2 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -394,6 +394,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; @@ -1663,6 +1665,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); |