Memory leak and NULL dereference fixes.

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 946884860fc085002338480c4eea4f312f6241e0..7e1cf9cba225816bf30b57712806b179414aa88d 100644 (file)
--- 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);