use the portable construct around asprintf; pointed out by halex

diff --git a/lib/libcrypto/conf/conf_mod.c b/lib/libcrypto/conf/conf_mod.c
index 436f239..2417086 100644 (file)
--- a/lib/libcrypto/conf/conf_mod.c
+++ b/lib/libcrypto/conf/conf_mod.c
@@ -551,7 +551,8 @@ CONF_get1_default_config_file(void)
        file = getenv("OPENSSL_CONF");
        if (file) 
                return BUF_strdup(file);
-       asprintf(&file, "%s/openssl.cnf", X509_get_default_cert_area());
+       if (asprintf(&file, "%s/openssl.cnf", X509_get_default_cert_area()) == -1)
+               return (NULL);
        return file;
 }
 

diff --git a/lib/libssl/src/apps/apps.c b/lib/libssl/src/apps/apps.c
index cb9f8b0..446bb4d 100644 (file)
--- a/lib/libssl/src/apps/apps.c
+++ b/lib/libssl/src/apps/apps.c
@@ -1326,7 +1326,8 @@ make_config_name()
        const char *t = X509_get_default_cert_area();
        char *p;
 
-       asprintf(&p, "%s/openssl.cnf", t);
+       if (asprintf(&p, "%s/openssl.cnf", t) == -1)
+               return NULL;
        return p;
 }
 

diff --git a/lib/libssl/src/crypto/conf/conf_mod.c b/lib/libssl/src/crypto/conf/conf_mod.c
index 436f239..2417086 100644 (file)
--- a/lib/libssl/src/crypto/conf/conf_mod.c
+++ b/lib/libssl/src/crypto/conf/conf_mod.c
@@ -551,7 +551,8 @@ CONF_get1_default_config_file(void)
        file = getenv("OPENSSL_CONF");
        if (file) 
                return BUF_strdup(file);
-       asprintf(&file, "%s/openssl.cnf", X509_get_default_cert_area());
+       if (asprintf(&file, "%s/openssl.cnf", X509_get_default_cert_area()) == -1)
+               return (NULL);
        return file;
 }