aboutsummaryrefslogtreecommitdiff
path: root/openssl/apps/apps.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-09-02 18:24:12 +0200
committerMike DePaulo <mikedep333@gmail.com>2015-02-28 07:15:53 -0500
commit8fafe3481b134a4d368ba57e3698754a6a45c4c1 (patch)
treeb617e841e1b5c0b234f7698331e5fb1be1c2332a /openssl/apps/apps.c
parentfe03d6aef6338e43593f164b09ae993bcd0ecbdd (diff)
downloadvcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.gz
vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.bz2
vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.zip
Upgrade openssl to version openssl-1.0.1i
Diffstat (limited to 'openssl/apps/apps.c')
-rw-r--r--openssl/apps/apps.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/openssl/apps/apps.c b/openssl/apps/apps.c
index b76db10a5..3e18289a4 100644
--- a/openssl/apps/apps.c
+++ b/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);