summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoganaden Velvindron <loganaden@gmail.com>2015-04-22 16:16:30 +0100
committerMatt Caswell <matt@openssl.org>2015-04-22 17:24:47 +0100
commite3dd33c25c885ab3bfe707d87ddb12f845d77032 (patch)
tree796b91d76d9a5532e629ae7827aa4b9eb610058e
parentd695a0225456f790d1fb93e19784f0c5b8397220 (diff)
Fix CRYPTO_strdup
The function CRYPTO_strdup (aka OPENSSL_strdup) fails to check the return value from CRYPTO_malloc to see if it is NULL before attempting to use it. This patch adds a NULL check. RT3786 Signed-off-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 37b0cf936744d9edb99b5dd82cae78a7eac6ad60) Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 20d21389c8b6f5b754573ffb6a4dc4f3986f2ca4)
-rw-r--r--crypto/mem.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/mem.c b/crypto/mem.c
index 2ce3e89487..fdad49b76e 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -365,6 +365,9 @@ char *CRYPTO_strdup(const char *str, const char *file, int line)
{
char *ret = CRYPTO_malloc(strlen(str) + 1, file, line);
+ if (ret == NULL)
+ return NULL;
+
strcpy(ret, str);
return ret;
}