From e5771c8113183d9900791e248265caa10e314025 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 18 Apr 2014 15:38:16 +0000
Subject: use the portable construct around asprintf; pointed out by halex
---
src/lib/libcrypto/conf/conf_mod.c | 3 ++-
src/lib/libssl/src/apps/apps.c | 3 ++-
src/lib/libssl/src/crypto/conf/conf_mod.c | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c
index 436f239b12..2417086537 100644
--- a/src/lib/libcrypto/conf/conf_mod.c
+++ b/src/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/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c
index cb9f8b0058..446bb4d17c 100644
--- a/src/lib/libssl/src/apps/apps.c
+++ b/src/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/src/lib/libssl/src/crypto/conf/conf_mod.c b/src/lib/libssl/src/crypto/conf/conf_mod.c
index 436f239b12..2417086537 100644
--- a/src/lib/libssl/src/crypto/conf/conf_mod.c
+++ b/src/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;
}
--
cgit v1.2.3-55-g6feb